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

261 files changed, 0 insertions, 18657 deletions

diff --git a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h b/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h
deleted file mode 100644
index 27344b5..0000000
--- a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
-#define __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities$VisibleComponentList;
-          class AWTUtilities$VisibleComponentList$VisibleComponentIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities$VisibleComponentList$VisibleComponentIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTUtilities$VisibleComponentList$VisibleComponentIterator(::gnu::java::awt::AWTUtilities$VisibleComponentList *, jint);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasPrevious();
-  virtual ::java::lang::Object * previous();
-  virtual jint nextIndex();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void set(::java::lang::Object *);
-  virtual void add(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint listIndex;
-  ::gnu::java::awt::AWTUtilities$VisibleComponentList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
diff --git a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h b/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h
deleted file mode 100644
index 53a5eb3..0000000
--- a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities$VisibleComponentList__
-#define __gnu_java_awt_AWTUtilities$VisibleComponentList__
-
-#pragma interface
-
-#include <java/util/AbstractSequentialList.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities$VisibleComponentList;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities$VisibleComponentList : public ::java::util::AbstractSequentialList
-{
-
-public: // actually package-private
-  AWTUtilities$VisibleComponentList(JArray< ::java::awt::Component * > *);
-public:
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual jint size();
-public: // actually package-private
-  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::util::AbstractSequentialList)))) components;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities$VisibleComponentList__
diff --git a/libjava/gnu/java/awt/AWTUtilities.h b/libjava/gnu/java/awt/AWTUtilities.h
deleted file mode 100644
index 70b5111..0000000
--- a/libjava/gnu/java/awt/AWTUtilities.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities__
-#define __gnu_java_awt_AWTUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Font;
-        class FontMetrics;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Window;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities : public ::java::lang::Object
-{
-
-public:
-  AWTUtilities();
-  static ::java::util::List * getVisibleChildren(::java::awt::Container *);
-  static ::java::awt::Rectangle * calculateInsetArea(::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *);
-  static ::java::awt::Rectangle * getLocalBounds(::java::awt::Component *);
-  static ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  static ::java::awt::Container * getAncestorNamed(::java::lang::String *, ::java::awt::Component *);
-  static ::java::awt::Container * getAncestorOfClass(::java::lang::Class *, ::java::awt::Component *);
-  static ::java::awt::Window * windowForComponent(::java::awt::Component *);
-  static ::java::awt::Component * getRoot(::java::awt::Component *);
-  static jboolean isDescendingFrom(::java::awt::Component *, ::java::awt::Component *);
-  static ::java::awt::Component * getDeepestComponentAt(::java::awt::Component *, jint, jint);
-  static void convertPointToScreen(::java::awt::Point *, ::java::awt::Component *);
-  static void convertPointFromScreen(::java::awt::Point *, ::java::awt::Component *);
-  static ::java::awt::Point * convertPoint(::java::awt::Component *, jint, jint, ::java::awt::Component *);
-  static ::java::awt::Rectangle * convertRectangle(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
-  static ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::Component *, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
-  static void invokeLater(::java::lang::Runnable *);
-  static void invokeAndWait(::java::lang::Runnable *);
-  static jboolean isEventDispatchThread();
-  static jboolean isValidKey(jint);
-public: // actually package-private
-  static ::java::util::WeakHashMap * visibleChildrenCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities__
diff --git a/libjava/gnu/java/awt/BitMaskExtent.h b/libjava/gnu/java/awt/BitMaskExtent.h
deleted file mode 100644
index 5d3fd63..0000000
--- a/libjava/gnu/java/awt/BitMaskExtent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitMaskExtent__
-#define __gnu_java_awt_BitMaskExtent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitMaskExtent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitMaskExtent : public ::java::lang::Object
-{
-
-public:
-  BitMaskExtent();
-  void setMask(jlong);
-  jlong toMask();
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) leastSignificantBit;
-  jbyte bitWidth;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitMaskExtent__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h b/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h
deleted file mode 100644
index d67d140..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite$GeneralContext__
-#define __gnu_java_awt_BitwiseXORComposite$GeneralContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite$GeneralContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite$GeneralContext : public ::java::lang::Object
-{
-
-public:
-  BitwiseXORComposite$GeneralContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::Color *);
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual void dispose();
-public: // actually package-private
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) srcColorModel;
-  ::java::awt::image::ColorModel * dstColorModel;
-  ::java::awt::Color * xorColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite$GeneralContext__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h b/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h
deleted file mode 100644
index 25d67e7..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite$IntContext__
-#define __gnu_java_awt_BitwiseXORComposite$IntContext__
-
-#pragma interface
-
-#include <gnu/java/awt/BitwiseXORComposite$GeneralContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite$IntContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite$IntContext : public ::gnu::java::awt::BitwiseXORComposite$GeneralContext
-{
-
-public:
-  BitwiseXORComposite$IntContext(::java::awt::image::ColorModel *, ::java::awt::Color *);
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  static jboolean isSupported(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite$IntContext__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite.h b/libjava/gnu/java/awt/BitwiseXORComposite.h
deleted file mode 100644
index 2dd89d6..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite__
-#define __gnu_java_awt_BitwiseXORComposite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite : public ::java::lang::Object
-{
-
-public:
-  BitwiseXORComposite(::java::awt::Color *);
-  virtual ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xorColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite__
diff --git a/libjava/gnu/java/awt/Buffers.h b/libjava/gnu/java/awt/Buffers.h
deleted file mode 100644
index 9456b13..0000000
--- a/libjava/gnu/java/awt/Buffers.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_Buffers__
-#define __gnu_java_awt_Buffers__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class Buffers;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::Buffers : public ::java::lang::Object
-{
-
-public:
-  Buffers();
-  static ::java::awt::image::DataBuffer * createBuffer(jint, ::java::lang::Object *, jint);
-  static ::java::awt::image::DataBuffer * createBuffer(jint, jint);
-  static ::java::awt::image::DataBuffer * createBuffer(jint, jint, jint);
-  static ::java::awt::image::DataBuffer * createBufferFromData(jint, ::java::lang::Object *, jint);
-  static ::java::lang::Object * getData(::java::awt::image::DataBuffer *);
-  static ::java::lang::Object * getData(::java::awt::image::DataBuffer *, jint, ::java::lang::Object *, jint, jint);
-  static jint smallestAppropriateTransferType(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_Buffers__
diff --git a/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h b/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
deleted file mode 100644
index 4f3c2ab..0000000
--- a/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ClasspathGraphicsEnvironment__
-#define __gnu_java_awt_ClasspathGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathGraphicsEnvironment;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ClasspathGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  ClasspathGraphicsEnvironment();
-  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ClasspathGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/ClasspathToolkit.h b/libjava/gnu/java/awt/ClasspathToolkit.h
deleted file mode 100644
index 565b924..0000000
--- a/libjava/gnu/java/awt/ClasspathToolkit.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ClasspathToolkit__
-#define __gnu_java_awt_ClasspathToolkit__
-
-#pragma interface
-
-#include <java/awt/Toolkit.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathToolkit;
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop;
-        class Font;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-      namespace peer
-      {
-          class DesktopPeer;
-          class RobotPeer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ClasspathToolkit : public ::java::awt::Toolkit
-{
-
-public:
-  ClasspathToolkit();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment() = 0;
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::awt::Font * getFont(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *) = 0;
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *) = 0;
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *) = 0;
-  virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
-  virtual jint getMouseNumberOfButtons();
-public: // actually protected
-  virtual ::java::awt::peer::DesktopPeer * createDesktopPeer(::java::awt::Desktop *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ClasspathToolkit__
diff --git a/libjava/gnu/java/awt/ComponentDataBlitOp.h b/libjava/gnu/java/awt/ComponentDataBlitOp.h
deleted file mode 100644
index 0db1e05..0000000
--- a/libjava/gnu/java/awt/ComponentDataBlitOp.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ComponentDataBlitOp__
-#define __gnu_java_awt_ComponentDataBlitOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ComponentDataBlitOp;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ComponentDataBlitOp : public ::java::lang::Object
-{
-
-public:
-  ComponentDataBlitOp();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  static ::gnu::java::awt::ComponentDataBlitOp * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ComponentDataBlitOp__
diff --git a/libjava/gnu/java/awt/ComponentReshapeEvent.h b/libjava/gnu/java/awt/ComponentReshapeEvent.h
deleted file mode 100644
index bfd6f83..0000000
--- a/libjava/gnu/java/awt/ComponentReshapeEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ComponentReshapeEvent__
-#define __gnu_java_awt_ComponentReshapeEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ComponentReshapeEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::ComponentReshapeEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ComponentReshapeEvent(::java::awt::Component *, jint, jint, jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) x;
-  jint y;
-  jint width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ComponentReshapeEvent__
diff --git a/libjava/gnu/java/awt/EmbeddedWindow.h b/libjava/gnu/java/awt/EmbeddedWindow.h
deleted file mode 100644
index 5a251bf..0000000
--- a/libjava/gnu/java/awt/EmbeddedWindow.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_EmbeddedWindow__
-#define __gnu_java_awt_EmbeddedWindow__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::EmbeddedWindow : public ::java::awt::Frame
-{
-
-public:
-  EmbeddedWindow();
-  EmbeddedWindow(jlong);
-  virtual void addNotify();
-  virtual void setHandle(jlong);
-  virtual jlong getHandle();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Frame)))) handle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_EmbeddedWindow__
diff --git a/libjava/gnu/java/awt/EventModifier.h b/libjava/gnu/java/awt/EventModifier.h
deleted file mode 100644
index b6c2193..0000000
--- a/libjava/gnu/java/awt/EventModifier.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_EventModifier__
-#define __gnu_java_awt_EventModifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EventModifier;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::EventModifier : public ::java::lang::Object
-{
-
-  EventModifier();
-public:
-  static jint extend(jint);
-  static jint revert(jint);
-  static const jint OLD_MASK = 63;
-  static const jint NEW_MASK = 16320;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_EventModifier__
diff --git a/libjava/gnu/java/awt/GradientPaintContext.h b/libjava/gnu/java/awt/GradientPaintContext.h
deleted file mode 100644
index a3aacbb..0000000
--- a/libjava/gnu/java/awt/GradientPaintContext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_GradientPaintContext__
-#define __gnu_java_awt_GradientPaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class GradientPaintContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::GradientPaintContext : public ::java::lang::Object
-{
-
-public:
-  GradientPaintContext(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *, jboolean);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-  virtual void dispose();
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) x1;
-  jfloat y1;
-  ::java::awt::Color * c1;
-  jfloat x2;
-  jfloat y2;
-  ::java::awt::Color * c2;
-  jboolean cyclic;
-  jdouble length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_GradientPaintContext__
diff --git a/libjava/gnu/java/awt/LowPriorityEvent.h b/libjava/gnu/java/awt/LowPriorityEvent.h
deleted file mode 100644
index edec534..0000000
--- a/libjava/gnu/java/awt/LowPriorityEvent.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_LowPriorityEvent__
-#define __gnu_java_awt_LowPriorityEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class LowPriorityEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::LowPriorityEvent : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_LowPriorityEvent__
diff --git a/libjava/gnu/java/awt/color/CieXyzConverter.h b/libjava/gnu/java/awt/color/CieXyzConverter.h
deleted file mode 100644
index 9541963..0000000
--- a/libjava/gnu/java/awt/color/CieXyzConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_CieXyzConverter__
-#define __gnu_java_awt_color_CieXyzConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class CieXyzConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::CieXyzConverter : public ::java::lang::Object
-{
-
-public:
-  CieXyzConverter();
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_CieXyzConverter__
diff --git a/libjava/gnu/java/awt/color/ClutProfileConverter.h b/libjava/gnu/java/awt/color/ClutProfileConverter.h
deleted file mode 100644
index 0b8ba5c..0000000
--- a/libjava/gnu/java/awt/color/ClutProfileConverter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ClutProfileConverter__
-#define __gnu_java_awt_color_ClutProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ClutProfileConverter;
-            class ColorLookUpTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ClutProfileConverter : public ::java::lang::Object
-{
-
-public:
-  ClutProfileConverter(::java::awt::color::ICC_Profile *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-private:
-  ::gnu::java::awt::color::ColorLookUpTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-  jint nChannels;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ClutProfileConverter__
diff --git a/libjava/gnu/java/awt/color/ColorLookUpTable.h b/libjava/gnu/java/awt/color/ColorLookUpTable.h
deleted file mode 100644
index b61fc84..0000000
--- a/libjava/gnu/java/awt/color/ColorLookUpTable.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ColorLookUpTable__
-#define __gnu_java_awt_color_ColorLookUpTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ColorLookUpTable : public ::java::lang::Object
-{
-
-public:
-  ColorLookUpTable(::java::awt::color::ICC_Profile *, jint);
-private:
-  void readClut16(JArray< jbyte > *);
-  void readClut8(JArray< jbyte > *);
-public: // actually package-private
-  virtual JArray< jfloat > * lookup(JArray< jfloat > *);
-private:
-  JArray< jfloat > * LabtoXYZ(JArray< jfloat > *);
-  JArray< jfloat > * XYZtoLab(JArray< jfloat > *);
-  static JArray< jfloat > * D50;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nIn;
-  jint nOut;
-  jint nInTableEntries;
-  jint nOutTableEntries;
-  jint gridpoints;
-  jint nClut;
-  JArray< JArray< jdouble > * > * inTable;
-  JArray< JArray< jshort > * > * outTable;
-  JArray< jdouble > * clut;
-  JArray< JArray< jfloat > * > * inMatrix;
-  jboolean useMatrix;
-  JArray< jint > * multiplier;
-  JArray< jint > * offsets;
-  jboolean inputLab;
-  jboolean outputLab;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ColorLookUpTable__
diff --git a/libjava/gnu/java/awt/color/ColorSpaceConverter.h b/libjava/gnu/java/awt/color/ColorSpaceConverter.h
deleted file mode 100644
index cc3b19f..0000000
--- a/libjava/gnu/java/awt/color/ColorSpaceConverter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ColorSpaceConverter__
-#define __gnu_java_awt_color_ColorSpaceConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorSpaceConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ColorSpaceConverter : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_color_ColorSpaceConverter__
diff --git a/libjava/gnu/java/awt/color/GrayProfileConverter.h b/libjava/gnu/java/awt/color/GrayProfileConverter.h
deleted file mode 100644
index b79d2b7..0000000
--- a/libjava/gnu/java/awt/color/GrayProfileConverter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_GrayProfileConverter__
-#define __gnu_java_awt_color_GrayProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-            class GrayProfileConverter;
-            class GrayScaleConverter;
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileGray;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::GrayProfileConverter : public ::java::lang::Object
-{
-
-public:
-  GrayProfileConverter(::java::awt::color::ICC_ProfileGray *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-private:
-  ::gnu::java::awt::color::GrayScaleConverter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gc;
-  ::gnu::java::awt::color::ToneReproductionCurve * trc;
-  ::gnu::java::awt::color::ColorLookUpTable * toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_GrayProfileConverter__
diff --git a/libjava/gnu/java/awt/color/GrayScaleConverter.h b/libjava/gnu/java/awt/color/GrayScaleConverter.h
deleted file mode 100644
index bcd8d26..0000000
--- a/libjava/gnu/java/awt/color/GrayScaleConverter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_GrayScaleConverter__
-#define __gnu_java_awt_color_GrayScaleConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class GrayScaleConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::GrayScaleConverter : public ::java::lang::Object
-{
-
-public:
-  GrayScaleConverter();
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-public: // actually package-private
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) coeff;
-private:
-  static JArray< jfloat > * D50;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_GrayScaleConverter__
diff --git a/libjava/gnu/java/awt/color/LinearRGBConverter.h b/libjava/gnu/java/awt/color/LinearRGBConverter.h
deleted file mode 100644
index bff63b7..0000000
--- a/libjava/gnu/java/awt/color/LinearRGBConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_LinearRGBConverter__
-#define __gnu_java_awt_color_LinearRGBConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class LinearRGBConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::LinearRGBConverter : public ::java::lang::Object
-{
-
-public:
-  LinearRGBConverter();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_LinearRGBConverter__
diff --git a/libjava/gnu/java/awt/color/ProfileHeader.h b/libjava/gnu/java/awt/color/ProfileHeader.h
deleted file mode 100644
index 744dc78..0000000
--- a/libjava/gnu/java/awt/color/ProfileHeader.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ProfileHeader__
-#define __gnu_java_awt_color_ProfileHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ProfileHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ProfileHeader : public ::java::lang::Object
-{
-
-public:
-  ProfileHeader();
-  ProfileHeader(JArray< jbyte > *);
-  virtual void verifyHeader(jint);
-  virtual JArray< jbyte > * getData(jint);
-  virtual jint getSize();
-  virtual void setSize(jint);
-  virtual jint getMajorVersion();
-  virtual jint getMinorVersion();
-  virtual jint getProfileClass();
-  virtual void setProfileClass(jint);
-  virtual jint getColorSpace();
-  virtual jint getProfileColorSpace();
-  virtual void setColorSpace(jint);
-  virtual void setProfileColorSpace(jint);
-private:
-  static const jint icMagicNumber = 1633907568;
-  static JArray< jint > * csTypeMap;
-public:
-  static const jint HEADERSIZE = 128;
-private:
-  static JArray< jint > * classMap;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-  jint cmmId;
-  jint majorVersion;
-  jint minorVersion;
-  jint profileClass;
-  jint colorSpace;
-  jint profileColorSpace;
-  JArray< jbyte > * timestamp;
-  jint platform;
-  jint flags;
-  jint magic;
-  jint manufacturerSig;
-  jint modelSig;
-  JArray< jbyte > * attributes;
-  jint intent;
-  JArray< jbyte > * illuminant;
-  jint creatorSig;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ProfileHeader__
diff --git a/libjava/gnu/java/awt/color/PyccConverter.h b/libjava/gnu/java/awt/color/PyccConverter.h
deleted file mode 100644
index ef9caeb..0000000
--- a/libjava/gnu/java/awt/color/PyccConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_PyccConverter__
-#define __gnu_java_awt_color_PyccConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class PyccConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::PyccConverter : public ::java::lang::Object
-{
-
-public:
-  PyccConverter();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_PyccConverter__
diff --git a/libjava/gnu/java/awt/color/RgbProfileConverter.h b/libjava/gnu/java/awt/color/RgbProfileConverter.h
deleted file mode 100644
index 2998894..0000000
--- a/libjava/gnu/java/awt/color/RgbProfileConverter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_RgbProfileConverter__
-#define __gnu_java_awt_color_RgbProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-            class RgbProfileConverter;
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileRGB;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::RgbProfileConverter : public ::java::lang::Object
-{
-
-public:
-  RgbProfileConverter(::java::awt::color::ICC_ProfileRGB *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-private:
-  JArray< JArray< jfloat > * > * invertMatrix(JArray< JArray< jfloat > * > *);
-  JArray< JArray< jfloat > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) matrix;
-  JArray< JArray< jfloat > * > * inv_matrix;
-  ::gnu::java::awt::color::ToneReproductionCurve * rTRC;
-  ::gnu::java::awt::color::ToneReproductionCurve * gTRC;
-  ::gnu::java::awt::color::ToneReproductionCurve * bTRC;
-  ::gnu::java::awt::color::ColorLookUpTable * toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-  static JArray< jfloat > * D50;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_RgbProfileConverter__
diff --git a/libjava/gnu/java/awt/color/SrgbConverter.h b/libjava/gnu/java/awt/color/SrgbConverter.h
deleted file mode 100644
index 2debe68..0000000
--- a/libjava/gnu/java/awt/color/SrgbConverter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_SrgbConverter__
-#define __gnu_java_awt_color_SrgbConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class SrgbConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::SrgbConverter : public ::java::lang::Object
-{
-
-public:
-  SrgbConverter();
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  static JArray< jfloat > * XYZtoRGB(JArray< jfloat > *);
-  static JArray< jfloat > * RGBtoXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_SrgbConverter__
diff --git a/libjava/gnu/java/awt/color/TagEntry.h b/libjava/gnu/java/awt/color/TagEntry.h
deleted file mode 100644
index a464b32..0000000
--- a/libjava/gnu/java/awt/color/TagEntry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_TagEntry__
-#define __gnu_java_awt_color_TagEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class TagEntry;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::TagEntry : public ::java::lang::Object
-{
-
-public:
-  TagEntry(jint, jint, jint, JArray< jbyte > *);
-  TagEntry(jint, JArray< jbyte > *);
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::String * hashKey();
-  virtual ::java::lang::String * toString();
-  virtual jint getSignature();
-  virtual jint getSize();
-  virtual jint getOffset();
-  virtual void setOffset(jint);
-  static ::java::lang::String * tagHashKey(jint);
-  static const jint entrySize = 12;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) signature;
-  jint size;
-  jint offset;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_TagEntry__
diff --git a/libjava/gnu/java/awt/color/ToneReproductionCurve.h b/libjava/gnu/java/awt/color/ToneReproductionCurve.h
deleted file mode 100644
index 7c0edec..0000000
--- a/libjava/gnu/java/awt/color/ToneReproductionCurve.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ToneReproductionCurve__
-#define __gnu_java_awt_color_ToneReproductionCurve__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ToneReproductionCurve : public ::java::lang::Object
-{
-
-public:
-  ToneReproductionCurve(jfloat);
-  ToneReproductionCurve(JArray< jfloat > *);
-  ToneReproductionCurve(JArray< jshort > *);
-  virtual jfloat lookup(jfloat);
-  virtual jfloat reverseLookup(jfloat);
-  virtual void setupReverseTrc();
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trc;
-  jfloat gamma;
-  JArray< jfloat > * reverseTrc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ToneReproductionCurve__
diff --git a/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h b/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h
deleted file mode 100644
index 13cf4aa..0000000
--- a/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
-#define __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
-
-#pragma interface
-
-#include <java/awt/dnd/MouseDragGestureRecognizer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-            class GtkMouseDragGestureRecognizer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragSource;
-      }
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::GtkMouseDragGestureRecognizer : public ::java::awt::dnd::MouseDragGestureRecognizer
-{
-
-public:
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual void registerListeners();
-  virtual void unregisterListeners();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  jint getDropActionFromEvent(::java::awt::event::MouseEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h
deleted file mode 100644
index a53f916..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDragSourceContextPeer;
-                class GtkDropTargetContextPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragSourceContext;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDragSourceContextPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually package-private
-  virtual void nativeStartDrag(::java::awt::Image *, jint, jint, jint, ::java::lang::String *);
-  virtual void connectSignals(::java::awt::peer::ComponentPeer *);
-  virtual void create(::java::awt::peer::ComponentPeer *);
-  virtual void nativeSetCursor(jint);
-  virtual void setTarget(::gnu::java::awt::dnd::peer::gtk::GtkDropTargetContextPeer *);
-public:
-  GtkDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually package-private
-  virtual ::java::awt::peer::ComponentPeer * getComponentPeer(::java::awt::Component *);
-public:
-  virtual void startDrag(::java::awt::dnd::DragSourceContext *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void transferablesFlavorsChanged();
-  virtual void dragEnter(jint, jint);
-  virtual void dragExit(jint, jint, jint);
-  virtual void dragDropEnd(jint, jboolean, jint, jint);
-  virtual void dragMouseMoved(jint, jint);
-  virtual void dragOver(jint, jint);
-  virtual void dragActionChanged(jint, jint);
-private:
-  ::java::awt::peer::ComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) peer;
-  ::java::awt::Cursor * cursor;
-  ::java::awt::dnd::DragSourceContext * context;
-public:
-  static ::java::awt::Component * target;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h
deleted file mode 100644
index 2ddfeb5..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDropTargetContextPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDropTargetContextPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public:
-  GtkDropTargetContextPeer(::java::lang::Object *);
-  virtual void setTargetActions(jint);
-  virtual jint getTargetActions();
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual jboolean isTransferableJVMLocal();
-  virtual void acceptDrag(jint);
-  virtual void rejectDrag();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual void dropComplete(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h
deleted file mode 100644
index a5797f2..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDropTargetPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTarget;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDropTargetPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public:
-  GtkDropTargetPeer();
-  virtual void addDropTarget(::java::awt::dnd::DropTarget *);
-  virtual void removeDropTarget(::java::awt::dnd::DropTarget *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
diff --git a/libjava/gnu/java/awt/font/FontDelegate.h b/libjava/gnu/java/awt/font/FontDelegate.h
deleted file mode 100644
index add9155..0000000
--- a/libjava/gnu/java/awt/font/FontDelegate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_FontDelegate__
-#define __gnu_java_awt_font_FontDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::FontDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getFullName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getFamilyName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getSubFamilyName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getPostScriptName() = 0;
-  virtual jint getNumGlyphs() = 0;
-  virtual jint getGlyphIndex(jint) = 0;
-  virtual jint getMissingGlyphCode() = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0;
-  virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint) = 0;
-  virtual ::java::lang::String * getGlyphName(jint) = 0;
-  virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  static const jint FLAG_FITTED = 1;
-  static const jint FLAG_NO_HINT_HORIZONTAL = 2;
-  static const jint FLAG_NO_HINT_VERTICAL = 4;
-  static const jint FLAG_NO_HINT_EDGE_POINTS = 8;
-  static const jint FLAG_NO_HINT_STRONG_POINTS = 16;
-  static const jint FLAG_NO_HINT_WEAK_POINTS = 32;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_FontDelegate__
diff --git a/libjava/gnu/java/awt/font/FontFactory.h b/libjava/gnu/java/awt/font/FontFactory.h
deleted file mode 100644
index 660ca22..0000000
--- a/libjava/gnu/java/awt/font/FontFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_FontFactory__
-#define __gnu_java_awt_font_FontFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class FontFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::FontFactory : public ::java::lang::Object
-{
-
-  FontFactory();
-public:
-  static JArray< ::gnu::java::awt::font::FontDelegate * > * createFonts(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_FontFactory__
diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h
deleted file mode 100644
index a3f54bf..0000000
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_GNUGlyphVector__
-#define __gnu_java_awt_font_GNUGlyphVector__
-
-#pragma interface
-
-#include <java/awt/font/GlyphVector.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class GNUGlyphVector;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::GNUGlyphVector : public ::java::awt::font::GlyphVector
-{
-
-public:
-  GNUGlyphVector(::gnu::java::awt::font::FontDelegate *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void performDefaultLayout();
-  virtual jint getNumGlyphs();
-  virtual jint getGlyphCode(jint);
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *);
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds();
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds();
-  virtual ::java::awt::Shape * getOutline();
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat);
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat, jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint, jint);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *);
-  virtual jint getLayoutFlags();
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *);
-private:
-  jfloat getAscent();
-  jfloat getDescent();
-public:
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint);
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint);
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint);
-  virtual jboolean equals(::java::awt::font::GlyphVector *);
-private:
-  void validate();
-  ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::java::awt::font::GlyphVector)))) fontDelegate;
-  ::java::awt::Font * font;
-  ::java::awt::font::FontRenderContext * renderContext;
-  JArray< jint > * glyphs;
-  jfloat fontSize;
-  ::java::awt::geom::AffineTransform * transform;
-  jboolean valid;
-  JArray< jfloat > * pos;
-  JArray< ::java::awt::geom::AffineTransform * > * transforms;
-  jint layoutFlags;
-  ::java::awt::Shape * cleanOutline;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_GNUGlyphVector__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
deleted file mode 100644
index 3f0b4d2..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
-#define __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class OpenTypeFontPeer;
-            class OpenTypeFontPeer$XFontMetrics;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer$XFontMetrics : public ::java::awt::FontMetrics
-{
-
-public: // actually package-private
-  OpenTypeFontPeer$XFontMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *);
-public:
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint stringWidth(::java::lang::String *);
-private:
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) cachedPoint;
-public: // actually package-private
-  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
deleted file mode 100644
index 1fec3c2..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
-#define __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
-
-#pragma interface
-
-#include <java/awt/font/LineMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class OpenTypeFontPeer;
-            class OpenTypeFontPeer$XLineMetrics;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer$XLineMetrics : public ::java::awt::font::LineMetrics
-{
-
-public: // actually package-private
-  OpenTypeFontPeer$XLineMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-public:
-  virtual jfloat getAscent();
-  virtual jint getBaselineIndex();
-  virtual JArray< jfloat > * getBaselineOffsets();
-  virtual jfloat getDescent();
-  virtual jfloat getHeight();
-  virtual jfloat getLeading();
-  virtual jint getNumChars();
-  virtual jfloat getStrikethroughOffset();
-  virtual jfloat getStrikethroughThickness();
-  virtual jfloat getUnderlineOffset();
-  virtual jfloat getUnderlineThickness();
-private:
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) font;
-  ::java::awt::font::GlyphVector * glyphVector;
-  ::java::awt::font::FontRenderContext * fontRenderContext;
-public: // actually package-private
-  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
deleted file mode 100644
index 6129982..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer__
-#define __gnu_java_awt_font_OpenTypeFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class OpenTypeFontPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public:
-  OpenTypeFontPeer(::java::lang::String *, jint, jint);
-  OpenTypeFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  static ::java::lang::String * encodeFont(::java::lang::String *, ::java::util::Map *);
-public: // actually package-private
-  static ::java::lang::String * encodeFont(::java::lang::String *, jint);
-  static ::java::lang::String * validName(::java::lang::String *);
-public:
-  static JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-private:
-  static ::java::util::Set * getFontNames();
-  ::java::lang::String * mapFontToFilename(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::font::FontDelegate * access$0(::gnu::java::awt::font::OpenTypeFontPeer *);
-  static ::java::awt::geom::AffineTransform * access$1();
-private:
-  static ::java::util::Properties * fontProperties;
-  static ::java::util::Set * availableFontNames;
-  static ::java::util::Map * fontToFileMap;
-  static ::java::awt::geom::AffineTransform * IDENDITY;
-  ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) fontDelegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer__
diff --git a/libjava/gnu/java/awt/font/autofit/AutoHinter.h b/libjava/gnu/java/awt/font/autofit/AutoHinter.h
deleted file mode 100644
index e11a394..0000000
--- a/libjava/gnu/java/awt/font/autofit/AutoHinter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_AutoHinter__
-#define __gnu_java_awt_font_autofit_AutoHinter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AutoHinter;
-              class GlyphHints;
-              class HintScaler;
-              class Latin;
-              class LatinMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::AutoHinter : public ::java::lang::Object
-{
-
-public:
-  AutoHinter();
-  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *);
-  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *);
-  virtual void setFlags(jint);
-public: // actually package-private
-  ::gnu::java::awt::font::autofit::Latin * __attribute__((aligned(__alignof__( ::java::lang::Object)))) latinScript;
-  ::gnu::java::awt::font::autofit::LatinMetrics * metrics;
-  ::gnu::java::awt::font::autofit::GlyphHints * hints;
-  ::gnu::java::awt::font::autofit::HintScaler * scaler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_AutoHinter__
diff --git a/libjava/gnu/java/awt/font/autofit/AxisHints.h b/libjava/gnu/java/awt/font/autofit/AxisHints.h
deleted file mode 100644
index 0d8b7ea..0000000
--- a/libjava/gnu/java/awt/font/autofit/AxisHints.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_AxisHints__
-#define __gnu_java_awt_font_autofit_AxisHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AxisHints;
-              class Edge;
-              class Segment;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::AxisHints : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AxisHints();
-  virtual ::gnu::java::awt::font::autofit::Segment * newSegment();
-public:
-  virtual ::gnu::java::awt::font::autofit::Edge * newEdge(jint);
-public: // actually package-private
-  virtual jint getEdgeIndex(::gnu::java::awt::font::autofit::Edge *);
-  JArray< ::gnu::java::awt::font::autofit::Segment * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
-  jint majorDir;
-  jint numSegments;
-  jint numEdges;
-  JArray< ::gnu::java::awt::font::autofit::Edge * > * edges;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_AxisHints__
diff --git a/libjava/gnu/java/awt/font/autofit/Constants.h b/libjava/gnu/java/awt/font/autofit/Constants.h
deleted file mode 100644
index 60932a9..0000000
--- a/libjava/gnu/java/awt/font/autofit/Constants.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Constants__
-#define __gnu_java_awt_font_autofit_Constants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Constants;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Constants : public ::java::lang::Object
-{
-
-public:
-  static const jint DIMENSION_HORZ = 0;
-  static const jint DIMENSION_VERT = 1;
-  static const jint DIMENSION_MAX = 2;
-  static const jint DIR_NONE = 0;
-  static const jint DIR_RIGHT = 1;
-  static const jint DIR_LEFT = -1;
-  static const jint DIR_UP = 2;
-  static const jint DIR_DOWN = -2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_autofit_Constants__
diff --git a/libjava/gnu/java/awt/font/autofit/Edge.h b/libjava/gnu/java/awt/font/autofit/Edge.h
deleted file mode 100644
index f456c36..0000000
--- a/libjava/gnu/java/awt/font/autofit/Edge.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Edge__
-#define __gnu_java_awt_font_autofit_Edge__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class Segment;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Edge : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Edge();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fpos;
-  ::gnu::java::awt::font::autofit::Segment * first;
-  ::gnu::java::awt::font::autofit::Segment * last;
-  jint opos;
-  ::gnu::java::awt::font::autofit::Edge * link;
-  ::gnu::java::awt::font::autofit::Edge * serif;
-  jint flags;
-  jint dir;
-  ::gnu::java::awt::font::autofit::Width * blueEdge;
-  jint pos;
-  jint scale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Edge__
diff --git a/libjava/gnu/java/awt/font/autofit/GlyphHints.h b/libjava/gnu/java/awt/font/autofit/GlyphHints.h
deleted file mode 100644
index 27ce963..0000000
--- a/libjava/gnu/java/awt/font/autofit/GlyphHints.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_GlyphHints__
-#define __gnu_java_awt_font_autofit_GlyphHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AxisHints;
-              class GlyphHints;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::GlyphHints : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphHints();
-  virtual void rescale(::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void reload(::gnu::java::awt::font::opentype::truetype::Zone *);
-private:
-  void setWeakPoint(::gnu::java::awt::font::opentype::truetype::Point *);
-  void computeInflectionPoints();
-public: // actually package-private
-  virtual jboolean doHorizontal();
-  virtual jboolean doVertical();
-  virtual void alignWeakPoints(jint);
-private:
-  void iupShift(jint, jint, jint);
-  void iupInterp(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void alignStrongPoints(jint);
-private:
-  void storePoint(::gnu::java::awt::font::opentype::truetype::Point *, jint, jint, jshort);
-public: // actually package-private
-  virtual void alignEdgePoints(jint);
-private:
-  jint getPointIndex(::gnu::java::awt::font::opentype::truetype::Point *);
-public:
-  virtual jboolean doAlignEdgePoints();
-  virtual jboolean doAlignStrongPoints();
-  virtual jboolean doAlignWeakPoints();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  JArray< ::gnu::java::awt::font::autofit::AxisHints * > * axis;
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * points;
-  jint numPoints;
-  jint maxPoints;
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * contours;
-  jint numContours;
-  jint maxContours;
-  ::gnu::java::awt::font::autofit::ScriptMetrics * metrics;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_GlyphHints__
diff --git a/libjava/gnu/java/awt/font/autofit/HintScaler.h b/libjava/gnu/java/awt/font/autofit/HintScaler.h
deleted file mode 100644
index b494fe4..0000000
--- a/libjava/gnu/java/awt/font/autofit/HintScaler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_HintScaler__
-#define __gnu_java_awt_font_autofit_HintScaler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class HintScaler;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::HintScaler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HintScaler();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  ::gnu::java::awt::font::opentype::OpenTypeFont * face;
-  jint renderMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_HintScaler__
diff --git a/libjava/gnu/java/awt/font/autofit/Latin.h b/libjava/gnu/java/awt/font/autofit/Latin.h
deleted file mode 100644
index 7afa24c..0000000
--- a/libjava/gnu/java/awt/font/autofit/Latin.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Latin__
-#define __gnu_java_awt_font_autofit_Latin__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class GlyphHints;
-              class HintScaler;
-              class Latin;
-              class LatinMetrics;
-              class ScriptMetrics;
-              class Width;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Latin : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Latin();
-public:
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
-private:
-  void hintEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void alignSerifEdge(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
-  jint computeStemWidth(::gnu::java::awt::font::autofit::GlyphHints *, jint, jint, jint, jint);
-  jboolean doMono(::gnu::java::awt::font::autofit::GlyphHints *);
-  jint snapWidth(JArray< ::gnu::java::awt::font::autofit::Width * > *, jint, jint);
-  jint doneWidth(jint, jint);
-  jboolean doVertSnap(::gnu::java::awt::font::autofit::GlyphHints *);
-  jboolean doHorzSnap(::gnu::java::awt::font::autofit::GlyphHints *);
-  jboolean doStemAdjust(::gnu::java::awt::font::autofit::GlyphHints *);
-  void alignLinkedEdge(::gnu::java::awt::font::autofit::GlyphHints *, jint, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
-public:
-  virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *);
-private:
-  void scaleMetricsDim(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::autofit::HintScaler *, jint);
-  void initWidths(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *, jchar);
-public: // actually package-private
-  virtual void linkSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-private:
-  void initBlues(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  jint constant(::gnu::java::awt::font::autofit::LatinMetrics *, jint);
-  void computeSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  jboolean isTopBlue(jint);
-  void detectFeatures(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void computeEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void computeBlueEdges(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::LatinMetrics *);
-public: // actually package-private
-  static const jint MAX_WIDTHS = 16;
-private:
-  static const jint MAX_TEST_CHARS = 12;
-  static const jint CAPITAL_TOP = 0;
-  static const jint CAPITAL_BOTTOM = 1;
-  static const jint SMALL_F_TOP = 2;
-  static const jint SMALL_TOP = 3;
-  static const jint SMALL_BOTTOM = 4;
-  static const jint SMALL_MINOR = 5;
-public: // actually package-private
-  static const jint BLUE_MAX = 6;
-private:
-  static JArray< ::java::lang::String * > * TEST_CHARS;
-  static ::java::awt::geom::AffineTransform * IDENTITY;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Latin__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinAxis.h b/libjava/gnu/java/awt/font/autofit/LatinAxis.h
deleted file mode 100644
index 8c56e5a..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinAxis.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinAxis__
-#define __gnu_java_awt_font_autofit_LatinAxis__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinAxis;
-              class LatinBlue;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinAxis : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LatinAxis();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) scale;
-  jint delta;
-  jint widthCount;
-  JArray< ::gnu::java::awt::font::autofit::Width * > * widths;
-  jint edgeDistanceTreshold;
-  JArray< ::gnu::java::awt::font::autofit::LatinBlue * > * blues;
-  jint blueCount;
-  jint orgDelta;
-  jint orgScale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinAxis__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinBlue.h b/libjava/gnu/java/awt/font/autofit/LatinBlue.h
deleted file mode 100644
index b8a6a39..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinBlue.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinBlue__
-#define __gnu_java_awt_font_autofit_LatinBlue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinBlue;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinBlue : public ::java::lang::Object
-{
-
-public:
-  LatinBlue();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint FLAG_BLUE_ACTIVE = 1;
-  static const jint FLAG_TOP = 2;
-  static const jint FLAG_ADJUSTMENT = 4;
-  ::gnu::java::awt::font::autofit::Width * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ref;
-  ::gnu::java::awt::font::autofit::Width * shoot;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinBlue__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h b/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
deleted file mode 100644
index 18a21db..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinMetrics__
-#define __gnu_java_awt_font_autofit_LatinMetrics__
-
-#pragma interface
-
-#include <gnu/java/awt/font/autofit/ScriptMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinAxis;
-              class LatinMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinMetrics : public ::gnu::java::awt::font::autofit::ScriptMetrics
-{
-
-public: // actually package-private
-  LatinMetrics();
-  LatinMetrics(::gnu::java::awt::font::opentype::OpenTypeFont *);
-  JArray< ::gnu::java::awt::font::autofit::LatinAxis * > * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::autofit::ScriptMetrics)))) axis;
-  jint unitsPerEm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinMetrics__
diff --git a/libjava/gnu/java/awt/font/autofit/Script.h b/libjava/gnu/java/awt/font/autofit/Script.h
deleted file mode 100644
index 6455af5..0000000
--- a/libjava/gnu/java/awt/font/autofit/Script.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Script__
-#define __gnu_java_awt_font_autofit_Script__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class GlyphHints;
-              class HintScaler;
-              class Script;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Script : public ::java::lang::Object
-{
-
-public:
-  virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *) = 0;
-  virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_autofit_Script__
diff --git a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h b/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
deleted file mode 100644
index c58575b..0000000
--- a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_ScriptMetrics__
-#define __gnu_java_awt_font_autofit_ScriptMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class HintScaler;
-              class Script;
-              class ScriptMetrics;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::ScriptMetrics : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScriptMetrics();
-  ::gnu::java::awt::font::autofit::Script * __attribute__((aligned(__alignof__( ::java::lang::Object)))) script;
-  ::gnu::java::awt::font::autofit::HintScaler * scaler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_ScriptMetrics__
diff --git a/libjava/gnu/java/awt/font/autofit/Segment.h b/libjava/gnu/java/awt/font/autofit/Segment.h
deleted file mode 100644
index d3c1d72..0000000
--- a/libjava/gnu/java/awt/font/autofit/Segment.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Segment__
-#define __gnu_java_awt_font_autofit_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class Segment;
-          }
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Segment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Segment();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint FLAG_EDGE_NORMAL = 0;
-  static const jint FLAG_EDGE_ROUND = 1;
-  static const jint FLAG_EDGE_SERIF = 2;
-  static const jint FLAG_EDGE_DONE = 4;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dir;
-  jint flags;
-  ::gnu::java::awt::font::autofit::Segment * link;
-  ::gnu::java::awt::font::autofit::Segment * serif;
-  jint numLinked;
-  jint pos;
-  ::gnu::java::awt::font::opentype::truetype::Point * first;
-  ::gnu::java::awt::font::opentype::truetype::Point * last;
-  ::gnu::java::awt::font::opentype::truetype::Point * contour;
-  jint minPos;
-  jint maxPos;
-  jint score;
-  jint len;
-  ::gnu::java::awt::font::autofit::Segment * edgeNext;
-  ::gnu::java::awt::font::autofit::Edge * edge;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Segment__
diff --git a/libjava/gnu/java/awt/font/autofit/Utils.h b/libjava/gnu/java/awt/font/autofit/Utils.h
deleted file mode 100644
index 12fb2f5..0000000
--- a/libjava/gnu/java/awt/font/autofit/Utils.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Utils__
-#define __gnu_java_awt_font_autofit_Utils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Utils;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Utils : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Utils();
-  static jint computeDirection(jint, jint);
-public:
-  static jint atan(jint, jint);
-  static jint angleDiff(jint, jint);
-public: // actually package-private
-  static void sort(jint, JArray< jint > *);
-  static void sort(jint, JArray< ::gnu::java::awt::font::autofit::Width * > *);
-  static jint pixRound(jint);
-  static jint pixFloor(jint);
-public:
-  static jint mulDiv(jint, jint, jint);
-private:
-  static const jint ATAN_BITS = 8;
-  static JArray< jbyte > * ATAN;
-  static const jint ANGLE_PI = 256;
-  static const jint ANGLE_PI2 = 128;
-  static const jint ANGLE_PI4 = 64;
-  static const jint ANGLE_2PI = 512;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Utils__
diff --git a/libjava/gnu/java/awt/font/autofit/Width.h b/libjava/gnu/java/awt/font/autofit/Width.h
deleted file mode 100644
index d107e50..0000000
--- a/libjava/gnu/java/awt/font/autofit/Width.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Width__
-#define __gnu_java_awt_font_autofit_Width__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Width : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Width(jint);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) org;
-  jint cur;
-  jint fit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Width__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h
deleted file mode 100644
index a5f784d..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Dummy;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Dummy : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-  CharGlyphMap$Dummy();
-public:
-  jint getGlyph(jint);
-public: // actually package-private
-  CharGlyphMap$Dummy(::gnu::java::awt::font::opentype::CharGlyphMap$Dummy *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h
deleted file mode 100644
index 0b5a45f..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type0;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type0 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public:
-  CharGlyphMap$Type0(::java::nio::ByteBuffer *);
-private:
-  void readSingleTable(::java::nio::ByteBuffer *, jint, jint, jint);
-public:
-  jint getGlyph(jint);
-private:
-  static ::java::lang::String * getUpper129(jint, jint, jint);
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) glyphToUCS2;
-  static ::java::lang::String * UPPER_ARABIC;
-  static ::java::lang::String * UPPER_EAST_EUROPEAN_ROMAN;
-  static ::java::lang::String * UPPER_CROATIAN;
-  static ::java::lang::String * UPPER_CYRILLIC;
-  static ::java::lang::String * UPPER_FARSI;
-  static ::java::lang::String * UPPER_GREEK;
-  static ::java::lang::String * UPPER_HEBREW;
-  static ::java::lang::String * UPPER_ICELANDIC;
-  static ::java::lang::String * UPPER_ROMAN;
-  static ::java::lang::String * UPPER_ROMANIAN;
-  static ::java::lang::String * UPPER_TURKISH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h
deleted file mode 100644
index d1250fc..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type12;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type12 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public: // actually package-private
-  static jboolean isSupported(jint, jint);
-  CharGlyphMap$Type12(::java::nio::ByteBuffer *, jint, jint);
-public:
-  jint getGlyph(jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) numGroups;
-  ::java::nio::IntBuffer * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h
deleted file mode 100644
index 3009200..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type4;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type4 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public: // actually package-private
-  static jboolean isSupported(jint, jint, jint);
-  static ::gnu::java::awt::font::opentype::CharGlyphMap$Type4 * readTable(::java::nio::ByteBuffer *, jint, jint);
-private:
-  CharGlyphMap$Type4(jint, ::java::nio::CharBuffer *, ::java::nio::CharBuffer *, ::java::nio::ShortBuffer *, ::java::nio::CharBuffer *);
-public:
-  jint getGlyph(jint);
-private:
-  jint find(jchar);
-  ::java::nio::CharBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) lastChar;
-  ::java::nio::CharBuffer * firstChar;
-  ::java::nio::ShortBuffer * idDelta;
-  ::java::nio::CharBuffer * rangeID;
-  jint numSegments;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h
deleted file mode 100644
index d5baafb..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap__
-#define __gnu_java_awt_font_opentype_CharGlyphMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap : public ::java::lang::Object
-{
-
-public:
-  CharGlyphMap();
-  virtual jint getGlyph(jint) = 0;
-  static ::gnu::java::awt::font::opentype::CharGlyphMap * forTable(::java::nio::ByteBuffer *);
-private:
-  static const jint PLATFORM_UNICODE = 0;
-  static const jint PLATFORM_MACINTOSH = 1;
-  static const jint PLATFORM_MICROSOFT = 3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap__
diff --git a/libjava/gnu/java/awt/font/opentype/GlyphNamer.h b/libjava/gnu/java/awt/font/opentype/GlyphNamer.h
deleted file mode 100644
index 55e4790..0000000
--- a/libjava/gnu/java/awt/font/opentype/GlyphNamer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_GlyphNamer__
-#define __gnu_java_awt_font_opentype_GlyphNamer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class GlyphNamer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::GlyphNamer : public ::java::lang::Object
-{
-
-  GlyphNamer(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  static ::gnu::java::awt::font::opentype::GlyphNamer * forTables(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public: // actually package-private
-  ::java::lang::String * getGlyphName(jint);
-private:
-  void readZapf(jint);
-  void readPost();
-  static ::java::lang::String * getAGLFNName(jchar);
-  static ::java::lang::String * getGlyphName(JArray< jchar > *);
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) postTable;
-  ::java::nio::ByteBuffer * zapfTable;
-  ::java::nio::IntBuffer * zapfOffsets;
-  jint zapfExtraInfo;
-  jint postFormat;
-  JArray< ::java::lang::String * > * glyphNames;
-  ::java::nio::CharBuffer * glyphCharacterCodes;
-  static JArray< ::java::lang::String * > * STANDARD_POSTSCRIPT_GLYPH_NAMES;
-  static ::java::lang::String * AGLFN_GLYPHS;
-  static ::java::lang::String * AGLFN_NAME_OFFSET;
-  static ::java::lang::String * AGLFN_NAMES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_GlyphNamer__
diff --git a/libjava/gnu/java/awt/font/opentype/Hinter.h b/libjava/gnu/java/awt/font/opentype/Hinter.h
deleted file mode 100644
index 29992b7..0000000
--- a/libjava/gnu/java/awt/font/opentype/Hinter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_Hinter__
-#define __gnu_java_awt_font_opentype_Hinter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::Hinter : public ::java::lang::Object
-{
-
-public:
-  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
-  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *) = 0;
-  virtual void setFlags(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_opentype_Hinter__
diff --git a/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h b/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h
deleted file mode 100644
index d6ba836..0000000
--- a/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_MacResourceFork$Resource__
-#define __gnu_java_awt_font_opentype_MacResourceFork$Resource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class MacResourceFork$Resource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::MacResourceFork$Resource : public ::java::lang::Object
-{
-
-  MacResourceFork$Resource(::java::nio::ByteBuffer *, jint, jshort, jint, jint);
-public:
-  jint getType();
-  jshort getID();
-  ::java::nio::ByteBuffer * getContent();
-  jint getLength();
-public: // actually package-private
-  MacResourceFork$Resource(::java::nio::ByteBuffer *, jint, jshort, jint, jint, ::gnu::java::awt::font::opentype::MacResourceFork$Resource *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jshort id;
-  jbyte attribute;
-  jint nameOffset;
-  jint dataOffset;
-  ::java::nio::ByteBuffer * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_MacResourceFork$Resource__
diff --git a/libjava/gnu/java/awt/font/opentype/MacResourceFork.h b/libjava/gnu/java/awt/font/opentype/MacResourceFork.h
deleted file mode 100644
index 76ad0a6..0000000
--- a/libjava/gnu/java/awt/font/opentype/MacResourceFork.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_MacResourceFork__
-#define __gnu_java_awt_font_opentype_MacResourceFork__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class MacResourceFork;
-              class MacResourceFork$Resource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::MacResourceFork : public ::java::lang::Object
-{
-
-public:
-  MacResourceFork(::java::nio::ByteBuffer *);
-  JArray< ::gnu::java::awt::font::opentype::MacResourceFork$Resource * > * getResources(jint);
-  ::gnu::java::awt::font::opentype::MacResourceFork$Resource * getResource(jint, jshort);
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) types;
-  JArray< JArray< ::gnu::java::awt::font::opentype::MacResourceFork$Resource * > * > * resources;
-  ::java::nio::ByteBuffer * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_MacResourceFork__
diff --git a/libjava/gnu/java/awt/font/opentype/NameDecoder.h b/libjava/gnu/java/awt/font/opentype/NameDecoder.h
deleted file mode 100644
index a33ffa3..0000000
--- a/libjava/gnu/java/awt/font/opentype/NameDecoder.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_NameDecoder__
-#define __gnu_java_awt_font_opentype_NameDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class NameDecoder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::NameDecoder : public ::java::lang::Object
-{
-
-public:
-  NameDecoder();
-  static ::java::lang::String * getName(::java::nio::ByteBuffer *, jint, ::java::util::Locale *);
-private:
-  static jint getMacLanguageCode(::java::util::Locale *);
-  static jint getMicrosoftLanguageCode(::java::util::Locale *);
-  static jint findLanguageCode(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * decodeName(jint, jint, jint, ::java::nio::ByteBuffer *, jint, jint);
-  static ::java::lang::String * decodeName(::java::lang::String *, ::java::nio::ByteBuffer *, jint, jint);
-  static ::java::util::Locale * getMacLocale(jint);
-  static ::java::util::Locale * getWindowsLocale(jint);
-  static ::java::lang::String * getMacCharsetName(jint);
-  static ::java::lang::String * getMicrosoftCharsetName(jint);
-public:
-  static ::java::util::Locale * getLocale(jint, jint, jint);
-  static ::java::lang::String * getCharsetName(jint, jint, jint);
-  static const jint NAME_COPYRIGHT = 0;
-  static const jint NAME_FAMILY = 1;
-  static const jint NAME_SUBFAMILY = 2;
-  static const jint NAME_UNIQUE = 3;
-  static const jint NAME_FULL = 4;
-  static const jint NAME_VERSION = 5;
-  static const jint NAME_POSTSCRIPT = 6;
-  static const jint NAME_TRADEMARK = 7;
-  static const jint NAME_MANUFACTURER = 8;
-  static const jint NAME_DESIGNER = 9;
-  static const jint NAME_DESCRIPTION = 10;
-  static const jint NAME_VENDOR_URL = 11;
-  static const jint NAME_DESIGNER_URL = 12;
-  static const jint NAME_LICENSE = 13;
-  static const jint NAME_LICENSE_URL = 14;
-  static const jint NAME_PREFERRED_FAMILY = 16;
-  static const jint NAME_PREFERRED_SUBFAMILY = 17;
-  static const jint NAME_FULL_MACCOMPATIBLE = 18;
-  static const jint NAME_SAMPLE_TEXT = 19;
-  static const jint NAME_POSTSCRIPT_CID = 20;
-private:
-  static const jint PLATFORM_MACINTOSH = 1;
-  static const jint PLATFORM_MICROSOFT = 3;
-  static ::java::lang::String * macLanguageCodes;
-  static ::java::lang::String * microsoftLanguageCodes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_NameDecoder__
diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
deleted file mode 100644
index 3fec583..0000000
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_OpenTypeFont__
-#define __gnu_java_awt_font_opentype_OpenTypeFont__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap;
-              class GlyphNamer;
-              class Hinter;
-              class OpenTypeFont;
-              class Scaler;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::OpenTypeFont : public ::java::lang::Object
-{
-
-public: // actually package-private
-  OpenTypeFont(::java::nio::ByteBuffer *, jint);
-private:
-  jint getTableIndex(jint);
-public:
-  ::java::lang::String * getFamilyName(::java::util::Locale *);
-  ::java::lang::String * getSubFamilyName(::java::util::Locale *);
-  ::java::lang::String * getFullName(::java::util::Locale *);
-  ::java::lang::String * getPostScriptName();
-  jint getNumGlyphs();
-  jint getMissingGlyphCode();
-private:
-  ::java::lang::String * getName(jint, ::java::util::Locale *);
-public:
-  jint getVersion();
-  ::java::nio::ByteBuffer * getFontTable(jint);
-  jint getFontTableSize(jint);
-private:
-  ::gnu::java::awt::font::opentype::CharGlyphMap * getCharGlyphMap();
-public:
-  jint getGlyph(jint);
-  ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  jint getGlyphIndex(jint);
-  void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
-  ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getRawGlyphOutline(jint, ::java::awt::geom::AffineTransform *);
-  ::java::lang::String * getGlyphName(jint);
-  jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-  jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-public: // actually package-private
-  static ::java::lang::String * tagToString(jint);
-private:
-  void checkHinter(jint);
-public: // actually package-private
-  static const jint TAG_OTTO = 1330926671;
-  static const jint TAG_SFNT = 1936092788;
-  static const jint TAG_TRUE = 1953658213;
-  static const jint TAG_TTCF = 1953784678;
-  static const jint TAG_ZAPF = 1516335206;
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buf;
-  jint numGlyphs;
-  JArray< jint > * tableTag;
-  JArray< jint > * tableStart;
-  JArray< jint > * tableLength;
-private:
-  jint version;
-public:
-  jint unitsPerEm;
-private:
-  jfloat emsPerUnit;
-  ::gnu::java::awt::font::opentype::Scaler * scaler;
-  ::gnu::java::awt::font::opentype::CharGlyphMap * cmap;
-  ::gnu::java::awt::font::opentype::GlyphNamer * glyphNamer;
-  ::gnu::java::awt::font::opentype::Hinter * hinter;
-  ::java::nio::ByteBuffer * nameTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_OpenTypeFont__
diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h
deleted file mode 100644
index d356250..0000000
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_OpenTypeFontFactory__
-#define __gnu_java_awt_font_opentype_OpenTypeFontFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-          namespace opentype
-          {
-              class OpenTypeFontFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::OpenTypeFontFactory : public ::java::lang::Object
-{
-
-  OpenTypeFontFactory();
-public:
-  static JArray< ::gnu::java::awt::font::FontDelegate * > * createFonts(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_OpenTypeFontFactory__
diff --git a/libjava/gnu/java/awt/font/opentype/Scaler.h b/libjava/gnu/java/awt/font/opentype/Scaler.h
deleted file mode 100644
index 6d229d7..0000000
--- a/libjava/gnu/java/awt/font/opentype/Scaler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_Scaler__
-#define __gnu_java_awt_font_opentype_Scaler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-              class Scaler;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::Scaler : public ::java::lang::Object
-{
-
-public:
-  Scaler();
-  virtual ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint) = 0;
-  virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
-  virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual ::gnu::java::awt::font::opentype::truetype::Zone * getRawOutline(jint, ::java::awt::geom::AffineTransform *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_Scaler__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h b/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
deleted file mode 100644
index 9427f13..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Fixed__
-#define __gnu_java_awt_font_opentype_truetype_Fixed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Fixed;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Fixed : public ::java::lang::Object
-{
-
-  Fixed();
-public:
-  static jint mul(jint, jint);
-  static jint mul16(jint, jint);
-  static jint div(jint, jint);
-  static jint div16(jint, jint);
-  static jint ceil(jint);
-  static jint floor(jint);
-  static jint vectorLength(jint, jint);
-  static jint intValue(jint);
-  static jfloat floatValue(jint);
-  static jfloat floatValue16(jint);
-  static jdouble doubleValue(jint);
-  static jint valueOf(jfloat);
-  static jint valueOf(jdouble);
-  static jint valueOf16(jdouble);
-  static ::java::lang::String * toString(jint);
-  static ::java::lang::String * toString(jint, jint);
-  static const jint ONE = 64;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Fixed__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
deleted file mode 100644
index f0582d3..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLoader__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-            namespace truetype
-            {
-                class GlyphLoader;
-                class GlyphLocator;
-                class GlyphMeasurer;
-                class VirtualMachine;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphLoader(::gnu::java::awt::font::opentype::truetype::GlyphLocator *, ::gnu::java::awt::font::opentype::truetype::VirtualMachine *, jint, jint, jint, ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer *);
-public:
-  void loadGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadGlyph(jint, ::java::awt::geom::AffineTransform *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
-private:
-  void loadSubGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadSimpleGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadCompoundGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  jdouble getDouble214(::java::nio::ByteBuffer *);
-  void loadFlags(jint, ::java::nio::ByteBuffer *);
-  void loadCoordinates(jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *);
-  void setPhantomPoints(jint, jint, ::gnu::java::awt::font::opentype::truetype::Zone *);
-  ::gnu::java::awt::font::opentype::truetype::GlyphLocator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyphLocator;
-  ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer * glyphMeasurer;
-  ::gnu::java::awt::font::opentype::truetype::VirtualMachine * vm;
-  jint unitsPerEm;
-  JArray< jint > * contourEndPoints;
-  JArray< jbyte > * pointFlags;
-  static const jshort ARGS_ARE_WORDS = 1;
-  static const jshort ARGS_ARE_XY_VALUES = 2;
-  static const jshort ROUND_XY_TO_GRID = 4;
-  static const jshort WE_HAVE_A_SCALE = 8;
-  static const jshort MORE_COMPONENTS = 32;
-  static const jshort WE_HAVE_AN_X_AND_Y_SCALE = 64;
-  static const jshort WE_HAVE_A_TWO_BY_TWO = 128;
-  static const jshort WE_HAVE_INSTRUCTIONS = 256;
-  static const jshort USE_MY_METRICS = 512;
-  static const jshort OVERLAP_COMPOUND = 1024;
-  static const jshort SCALED_COMPONENT_OFFSET = 2048;
-  static const jshort UNSCALED_COMPONENT_OFFSET = 4096;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLoader__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h
deleted file mode 100644
index 1e06f69..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/truetype/GlyphLocator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator$FourByte;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator$FourByte : public ::gnu::java::awt::font::opentype::truetype::GlyphLocator
-{
-
-public: // actually package-private
-  GlyphLocator$FourByte(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  ::java::nio::ByteBuffer * getGlyphData(jint);
-public: // actually package-private
-  ::java::nio::IntBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::truetype::GlyphLocator)))) indexToLoc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h
deleted file mode 100644
index 7489c5e..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/truetype/GlyphLocator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator$TwoByte;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator$TwoByte : public ::gnu::java::awt::font::opentype::truetype::GlyphLocator
-{
-
-public: // actually package-private
-  GlyphLocator$TwoByte(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  ::java::nio::ByteBuffer * getGlyphData(jint);
-public: // actually package-private
-  ::java::nio::CharBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::truetype::GlyphLocator)))) indexToLoc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h
deleted file mode 100644
index aa93b65..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphLocator();
-public:
-  static ::gnu::java::awt::font::opentype::truetype::GlyphLocator * forTable(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteBuffer * getGlyphData(jint) = 0;
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyfTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h
deleted file mode 100644
index 558584d..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
-#define __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphMeasurer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphMeasurer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphMeasurer(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  jint getAscent(jboolean);
-  jint getDescent(jboolean);
-  jint getLineGap(jboolean);
-  jint getAdvanceWidth(jint, jboolean);
-  jint getAdvanceHeight(jint, jboolean);
-private:
-  ::java::nio::ShortBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) horizontalGlyphMetrics;
-  ::java::nio::ShortBuffer * verticalGlyphMetrics;
-  jint numLongHorizontalMetricsEntries;
-  jint numLongVerticalMetricsEntries;
-  jint horizontalAscent;
-  jint verticalAscent;
-  jint horizontalDescent;
-  jint verticalDescent;
-  jint horizontalLineGap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Point.h b/libjava/gnu/java/awt/font/opentype/truetype/Point.h
deleted file mode 100644
index a993ca0..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Point.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Point__
-#define __gnu_java_awt_font_opentype_truetype_Point__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Point : public ::java::lang::Object
-{
-
-public:
-  Point();
-  virtual ::gnu::java::awt::font::opentype::truetype::Point * getNext();
-  virtual void setNext(::gnu::java::awt::font::opentype::truetype::Point *);
-  virtual ::gnu::java::awt::font::opentype::truetype::Point * getPrev();
-  virtual void setPrev(::gnu::java::awt::font::opentype::truetype::Point *);
-  virtual jint getOrigX();
-  virtual void setOrigX(jint);
-  virtual jint getOrigY();
-  virtual void setOrigY(jint);
-  virtual jint getInDir();
-  virtual void setInDir(jint);
-  virtual jint getOutDir();
-  virtual void setOutDir(jint);
-  virtual jshort getFlags();
-  virtual void setFlags(jshort);
-  virtual void addFlags(jshort);
-  virtual jboolean isControlPoint();
-  virtual jint getU();
-  virtual void setU(jint);
-  virtual jint getV();
-  virtual void setV(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint getX();
-  virtual void setX(jint);
-  virtual jint getY();
-  virtual void setY(jint);
-  virtual jint getScaledX();
-  virtual void setScaledX(jint);
-  virtual jint getScaledY();
-  virtual void setScaledY(jint);
-  static const jshort FLAG_TOUCHED_X = 1;
-  static const jshort FLAG_TOUCHED_Y = 2;
-  static const jshort FLAG_ON_CURVE = 4;
-  static const jshort FLAG_CONTOUR_END = 8;
-  static const jshort FLAG_WEAK_INTERPOLATION = 16;
-  static const jshort FLAG_INFLECTION = 32;
-  static const jshort FLAG_DONE_X = 64;
-  static const jshort FLAG_DONE_Y = 128;
-  static const jint DIR_RIGHT = 1;
-  static const jint DIR_LEFT = -1;
-  static const jint DIR_UP = 2;
-  static const jint DIR_DOWN = -2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) origX;
-  jint origY;
-  jint scaledX;
-  jint scaledY;
-  jint x;
-  jint y;
-  jint u;
-  jint v;
-  jshort flags;
-private:
-  ::gnu::java::awt::font::opentype::truetype::Point * prev;
-  ::gnu::java::awt::font::opentype::truetype::Point * next;
-public: // actually package-private
-  jint inDir;
-  jint outDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Point__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h b/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
deleted file mode 100644
index fadc996..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
-#define __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/Scaler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-            namespace truetype
-            {
-                class GlyphLoader;
-                class GlyphMeasurer;
-                class TrueTypeScaler;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::TrueTypeScaler : public ::gnu::java::awt::font::opentype::Scaler
-{
-
-public:
-  TrueTypeScaler(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getRawOutline(jint, ::java::awt::geom::AffineTransform *);
-  void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
-private:
-  jfloat scaleFromFUnits(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean);
-public:
-  jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-  jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::Scaler)))) glyfTable;
-  ::gnu::java::awt::font::opentype::truetype::GlyphLoader * glyphLoader;
-  ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer * glyphMeasurer;
-  ::gnu::java::awt::font::opentype::truetype::Zone * glyphZone;
-  jint unitsPerEm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h b/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h
deleted file mode 100644
index 6193a6d..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h
+++ /dev/null
@@ -1,153 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_VirtualMachine__
-#define __gnu_java_awt_font_opentype_truetype_VirtualMachine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class VirtualMachine;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::VirtualMachine : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VirtualMachine(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-private:
-  void resetGraphicsState();
-  void reloadControlValueTable();
-  jint funitsToPixels(jint);
-public:
-  virtual jboolean setup(jdouble, ::java::awt::geom::AffineTransform *, jboolean);
-private:
-  void execute(::java::nio::ByteBuffer *, jint);
-  void dumpInstruction(::java::nio::ByteBuffer *);
-  static jchar getNibble(jint, jint);
-  static ::java::lang::String * getHex(jbyte);
-  static ::java::lang::String * getHex(jshort);
-  static void skipAfter(::java::nio::ByteBuffer *, jint, jint, jint, jint, jboolean);
-  static jint getInstructionLength(jint);
-  jboolean executeInstruction(::java::nio::ByteBuffer *);
-  void setRoundingMode(jint, jint);
-  void deltaC(JArray< jint > *, jint, jint, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getZone(jint);
-  jint getProjection(jint, jint);
-  jint getDualProjection(jint, jint);
-  jint getProjection(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-  jint getOriginalProjection(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-  void handleISECT(jint, jint, jint, jint, jint);
-  static jint muldiv(jint, jint, jint);
-  jint getFreeDotProj();
-  void movePoint(::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void dumpVectors();
-  void handleIP();
-  void handleMDAP(jint, jboolean);
-  void handleMIAP(jint, jint, jboolean);
-  void handleMIRP(jint, jint, jint);
-  jint round(jint, jint);
-  static jint nround(jint, jint);
-  jboolean isRotated();
-  jboolean isStretched();
-  jint getPixelsPerEM();
-  void setProjectionVector(jshort, jshort);
-  void setFreedomVector(jshort, jshort);
-  void setDualVector(jshort, jshort);
-  jint applyCTM_x(jint, jint);
-  jint applyCTM_y(jint, jint);
-  static const jboolean PATENTED_HINTING = 0;
-  static const jboolean TRACE_EXECUTION = 0;
-  static const jshort ONE_214 = 16384;
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) storage;
-  JArray< jint > * stack;
-  jint maxStackElements;
-  jint sp;
-  JArray< ::java::nio::ByteBuffer * > * fdefBuffer;
-  JArray< jint > * fdefEntryPoint;
-  ::java::nio::ShortBuffer * controlValueTable;
-  JArray< jint > * cvt;
-  jint engineCompensation;
-  ::java::nio::ByteBuffer * fontProgram;
-  ::java::nio::ByteBuffer * preProgram;
-  jint numTwilightPoints;
-  jint pointSize;
-  ::java::awt::geom::AffineTransform * deviceTransform;
-  jint scaleX;
-  jint scaleY;
-  jint shearX;
-  jint shearY;
-  jboolean antialiased;
-  jint cvtCutIn;
-  jint deltaBase;
-  jint deltaShift;
-  jshort freeX;
-  jshort freeY;
-  jint loop;
-  jint minimumDistance;
-  jshort projX;
-  jshort projY;
-  jshort dualX;
-  jshort dualY;
-  jint rp0;
-  jint rp1;
-  jint rp2;
-  jboolean scanControl;
-  jint scanType;
-  jint singleWidthValue;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp0;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp1;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp2;
-  ::gnu::java::awt::font::opentype::truetype::Zone * twilightZone;
-  ::gnu::java::awt::font::opentype::truetype::Zone * glyphZone;
-  jboolean executeGlyphInstructions;
-  jboolean ignoreCVTProgram;
-  jint roundPeriod;
-  jint roundPhase;
-  jint roundThreshold;
-  jint cachedPixelsPerEM;
-  jint unitsPerEm;
-  static JArray< ::java::lang::String * > * INST_NAME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_VirtualMachine__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h b/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
deleted file mode 100644
index e564789..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Zone__
-#define __gnu_java_awt_font_opentype_truetype_Zone__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Zone : public ::java::lang::Object
-{
-
-public:
-  Zone(jint);
-  jint getCapacity();
-  jint getSize();
-  jint getX(jint);
-  jint getX(jint, jint);
-  void setX(jint, jint, jboolean);
-  void setY(jint, jint, jboolean);
-  jint getY(jint);
-  jint getY(jint, jint);
-  jint getOriginalX(jint);
-  jint getOriginalY(jint);
-  void setOriginalX(jint, jint);
-  void setOriginalY(jint, jint);
-  void setNumPoints(jint);
-  jboolean isOnCurve(jint);
-  void setOnCurve(jint, jboolean);
-  jboolean isContourEnd(jint);
-  void setContourEnd(jint, jboolean);
-public: // actually package-private
-  void transform(jdouble, ::java::awt::geom::AffineTransform *, jint, jint, jint);
-  void combineWithSubGlyph(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-private:
-  void dump();
-public:
-  ::java::awt::geom::PathIterator * getPathIterator(jint);
-  ::java::awt::geom::GeneralPath * getPath(jint);
-  jint getNumContours();
-  jint getContourEnd(jint);
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * getPoints();
-private:
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) points;
-  jint numPoints;
-public:
-  jdouble scaleX;
-  jdouble scaleY;
-  jdouble shearX;
-  jdouble shearY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Zone__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h b/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
deleted file mode 100644
index 5e64ba8..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
-#define __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Zone;
-                class ZonePathIterator;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::ZonePathIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ZonePathIterator(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-private:
-  jint getSuccessor(jint);
-public:
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint getSegment(jint, JArray< jfloat > *);
-  jint getStartSegment(jint, JArray< jfloat > *);
-  static const jint EMIT_SEGMENT = 0;
-  static const jint EMIT_CLOSE = 1;
-  static const jint EMIT_MOVETO = 2;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) state;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zone;
-  jint numPoints;
-  jint curPoint;
-  jint contourStart;
-  jint type;
-public: // actually package-private
-  JArray< jfloat > * floats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
diff --git a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
deleted file mode 100644
index ecd73a5..0000000
--- a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_AsyncImage$AsyncImageSource__
-#define __gnu_java_awt_image_AsyncImage$AsyncImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-            class AsyncImage$AsyncImageSource;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::AsyncImage$AsyncImageSource : public ::java::lang::Object
-{
-
-  AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-private:
-  ::java::awt::image::ImageProducer * getRealSource();
-public: // actually package-private
-  AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *, ::gnu::java::awt::image::AsyncImage$AsyncImageSource *);
-private:
-  ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) realSource;
-public: // actually package-private
-  ::gnu::java::awt::image::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_AsyncImage$AsyncImageSource__
diff --git a/libjava/gnu/java/awt/image/AsyncImage.h b/libjava/gnu/java/awt/image/AsyncImage.h
deleted file mode 100644
index 7c1a731..0000000
--- a/libjava/gnu/java/awt/image/AsyncImage.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_AsyncImage__
-#define __gnu_java_awt_image_AsyncImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::AsyncImage : public ::java::awt::Image
-{
-
-public: // actually package-private
-  AsyncImage();
-public:
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jboolean isComplete();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual void addObserver(::java::awt::image::ImageObserver *);
-  virtual jboolean prepareImage(jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * getRealImage();
-  virtual void setRealImage(::java::awt::Image *);
-  virtual void notifyObservers(jint, jint, jint, jint, jint);
-  virtual void waitForImage(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  static ::java::awt::Image * access$0(::gnu::java::awt::image::AsyncImage *);
-private:
-  ::java::awt::Image * volatile __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage;
-public: // actually package-private
-  ::java::util::HashSet * observers;
-private:
-  jboolean volatile complete;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_AsyncImage__
diff --git a/libjava/gnu/java/awt/image/ImageConverter.h b/libjava/gnu/java/awt/image/ImageConverter.h
deleted file mode 100644
index 8df255f..0000000
--- a/libjava/gnu/java/awt/image/ImageConverter.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageConverter__
-#define __gnu_java_awt_image_ImageConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-            class ImageConverter;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class IndexColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageConverter : public ::java::lang::Object
-{
-
-public:
-  ImageConverter();
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  ::java::awt::image::ColorModel * setupColorModel(::java::awt::image::ColorModel *);
-  void createImage();
-  jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
-  jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
-  jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jint > *, jint, jint, jint);
-  jint updateTransparency(jint, jint);
-public:
-  virtual void imageComplete(jint);
-  virtual void setTargetColorModel(::java::awt::image::ColorModel *);
-  virtual ::java::awt::Image * getImage();
-  static ::java::lang::String * IMAGE_TRANSPARENCY_PROPERTY;
-  static ::java::lang::String * IMAGE_PROPERTIES_PROPERTY;
-private:
-  ::gnu::java::awt::image::AsyncImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::BufferedImage * bImage;
-  ::java::util::Hashtable * imageProperties;
-  jint width;
-  jint height;
-  ::java::awt::image::ColorModel * colorModel;
-  ::java::awt::image::ColorModel * targetColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageConverter__
diff --git a/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h b/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h
deleted file mode 100644
index 611ead3b..0000000
--- a/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
-#define __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class ImageDecoder$DataInputStreamWrapper;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageDecoder$DataInputStreamWrapper : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  ImageDecoder$DataInputStreamWrapper(::java::io::DataInput *);
-public:
-  virtual jint read();
-private:
-  ::java::io::DataInput * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) datainput;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
diff --git a/libjava/gnu/java/awt/image/ImageDecoder.h b/libjava/gnu/java/awt/image/ImageDecoder.h
deleted file mode 100644
index 69af2a5..0000000
--- a/libjava/gnu/java/awt/image/ImageDecoder.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageDecoder__
-#define __gnu_java_awt_image_ImageDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class ImageDecoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageDecoder : public ::java::lang::Object
-{
-
-public:
-  ImageDecoder(::java::lang::String *);
-  ImageDecoder(::java::net::URL *);
-  ImageDecoder(::java::io::InputStream *);
-  ImageDecoder(::java::io::DataInput *);
-  ImageDecoder(JArray< jbyte > *, jint, jint);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *) = 0;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-  ::java::lang::String * filename;
-  ::java::net::URL * url;
-  JArray< jbyte > * data;
-  jint offset;
-  jint length;
-  ::java::io::InputStream * input;
-  ::java::io::DataInput * datainput;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageDecoder__
diff --git a/libjava/gnu/java/awt/image/XBMDecoder.h b/libjava/gnu/java/awt/image/XBMDecoder.h
deleted file mode 100644
index 0d33850..0000000
--- a/libjava/gnu/java/awt/image/XBMDecoder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_XBMDecoder__
-#define __gnu_java_awt_image_XBMDecoder__
-
-#pragma interface
-
-#include <gnu/java/awt/image/ImageDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class XBMDecoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::image::XBMDecoder : public ::gnu::java::awt::image::ImageDecoder
-{
-
-public:
-  XBMDecoder(::java::lang::String *);
-  XBMDecoder(::java::net::URL *);
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *);
-  static JArray< jint > * getScanline(::java::io::Reader *, jint);
-public: // actually package-private
-  ::java::io::BufferedReader * __attribute__((aligned(__alignof__( ::gnu::java::awt::image::ImageDecoder)))) reader;
-  static ::java::awt::image::ColorModel * cm;
-  static const jint black = -16777216;
-  static const jint transparent = 0;
-  static JArray< jint > * masktable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_XBMDecoder__
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
deleted file mode 100644
index 8effd32..0000000
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ /dev/null
@@ -1,226 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_AbstractGraphics2D__
-#define __gnu_java_awt_java2d_AbstractGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class AbstractGraphics2D;
-            class ScanlineConverter;
-            class ScanlineCoverage;
-            class ShapeCache;
-            class TextCacheKey;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BasicStroke;
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Paint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-          class ImageObserver;
-          class Raster;
-          class RenderedImage;
-          class WritableRaster;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::java2d::AbstractGraphics2D : public ::java::awt::Graphics2D
-{
-
-public: // actually protected
-  AbstractGraphics2D();
-public:
-  virtual void draw(::java::awt::Shape *);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-private:
-  jboolean drawImageImpl(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *, ::java::awt::Rectangle *);
-public:
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-private:
-  void drawRenderedImageImpl(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *, ::java::awt::Rectangle *);
-public:
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-private:
-  void drawRenderableImageImpl(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *, ::java::awt::Rectangle *);
-public:
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void fill(::java::awt::Shape *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual void setComposite(::java::awt::Composite *);
-  virtual void setPaint(::java::awt::Paint *);
-  virtual void setStroke(::java::awt::Stroke *);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void clip(::java::awt::Shape *);
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual ::java::awt::Graphics * create();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::java::awt::Color * getColor();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual void setClip(::java::awt::Shape *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void dispose();
-public: // actually protected
-  virtual void fillShape(::java::awt::Shape *, jboolean);
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::Rectangle * getDeviceBounds() = 0;
-  virtual void rawDrawLine(jint, jint, jint, jint);
-  virtual void rawDrawRect(jint, jint, jint, jint);
-  virtual void rawClearRect(jint, jint, jint, jint);
-  virtual void rawFillRect(jint, jint, jint, jint);
-  virtual jboolean rawDrawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void rawCopyArea(jint, jint, jint, jint, jint, jint);
-private:
-  void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-public:
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
-public: // actually protected
-  virtual void init();
-  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
-  virtual void updateRaster(::java::awt::image::Raster *, jint, jint, jint, jint);
-private:
-  void updateOptimization();
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  void updateClip(::java::awt::geom::AffineTransform *);
-  ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
-  void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *);
-  ::java::awt::PaintContext * getPaintContext();
-public:
-  static ::java::awt::Image * prepareImage(::java::awt::Image *, jint, jint);
-public: // actually protected
-  static ::java::util::WeakHashMap * imageCache;
-private:
-  static jboolean DEFAULT_TEXT_AA;
-  static ::java::awt::Font * FONT;
-  static const jint GV_CACHE_SIZE = 50;
-  static ::gnu::java::awt::java2d::ShapeCache * shapeCache;
-  static ::java::util::LinkedList * scanlineConverters;
-  static ::java::util::Map * gvCache;
-  static ::gnu::java::awt::java2d::TextCacheKey * searchTextKey;
-public: // actually protected
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
-private:
-  ::java::awt::Paint * paint;
-  ::java::awt::PaintContext * paintContext;
-  ::java::awt::Color * background;
-  ::java::awt::Color * foreground;
-  jboolean isForegroundColorNull;
-  ::java::awt::Font * font;
-  ::java::awt::Composite * composite;
-  ::java::awt::Stroke * stroke;
-  ::java::awt::Shape * clip__;
-  ::java::awt::RenderingHints * renderingHints;
-  ::java::awt::image::WritableRaster * destinationRaster;
-  jboolean isOptimized;
-  static ::java::awt::BasicStroke * STANDARD_STROKE;
-  static ::java::util::HashMap * STANDARD_HINTS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_AbstractGraphics2D__
diff --git a/libjava/gnu/java/awt/java2d/ActiveEdges.h b/libjava/gnu/java/awt/java2d/ActiveEdges.h
deleted file mode 100644
index 9310460..0000000
--- a/libjava/gnu/java/awt/java2d/ActiveEdges.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ActiveEdges__
-#define __gnu_java_awt_java2d_ActiveEdges__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ActiveEdges;
-            class PolyEdge;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ActiveEdges : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ActiveEdges();
-  void clear();
-  void add(::gnu::java::awt::java2d::PolyEdge *);
-  void intersectSortAndPack(jint, jint);
-  jint getNumActiveEdges();
-  ::gnu::java::awt::java2d::PolyEdge * getActiveEdge(jint);
-  void remove(jint);
-public:
-  ::java::lang::String * toString();
-private:
-  JArray< ::gnu::java::awt::java2d::PolyEdge * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) activeEdges;
-  jint numActiveEdges;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ActiveEdges__
diff --git a/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h b/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h
deleted file mode 100644
index 9c591a4..0000000
--- a/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_AlphaCompositeContext__
-#define __gnu_java_awt_java2d_AlphaCompositeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class AlphaCompositeContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::AlphaCompositeContext : public ::java::lang::Object
-{
-
-public:
-  AlphaCompositeContext(::java::awt::AlphaComposite *, ::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *);
-  virtual void dispose();
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  ::java::awt::AlphaComposite * __attribute__((aligned(__alignof__( ::java::lang::Object)))) composite;
-  ::java::awt::image::ColorModel * srcColorModel;
-  ::java::awt::image::ColorModel * dstColorModel;
-  jfloat fs;
-  jfloat fd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_AlphaCompositeContext__
diff --git a/libjava/gnu/java/awt/java2d/CubicSegment.h b/libjava/gnu/java/awt/java2d/CubicSegment.h
deleted file mode 100644
index c7ef3b2..0000000
--- a/libjava/gnu/java/awt/java2d/CubicSegment.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_CubicSegment__
-#define __gnu_java_awt_java2d_CubicSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class CubicSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::CubicSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  CubicSegment(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  CubicSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::Segment)))) cp1__;
-  ::java::awt::geom::Point2D * cp2__;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_CubicSegment__
diff --git a/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h b/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h
deleted file mode 100644
index b0a1d08..0000000
--- a/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
-#define __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ImagePaint;
-            class ImagePaint$ImagePaintContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ImagePaint$ImagePaintContext : public ::java::lang::Object
-{
-
-  ImagePaint$ImagePaintContext(::gnu::java::awt::java2d::ImagePaint *);
-public:
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-private:
-  void ensureRasterSize(jint, jint);
-public: // actually package-private
-  ImagePaint$ImagePaintContext(::gnu::java::awt::java2d::ImagePaint *, ::gnu::java::awt::java2d::ImagePaint$ImagePaintContext *);
-private:
-  ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-public: // actually package-private
-  ::gnu::java::awt::java2d::ImagePaint * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
diff --git a/libjava/gnu/java/awt/java2d/ImagePaint.h b/libjava/gnu/java/awt/java2d/ImagePaint.h
deleted file mode 100644
index e9e2ea2..0000000
--- a/libjava/gnu/java/awt/java2d/ImagePaint.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ImagePaint__
-#define __gnu_java_awt_java2d_ImagePaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ImagePaint;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ImagePaint : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImagePaint(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual jint getTransparency();
-public: // actually package-private
-  ::java::awt::image::RenderedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::geom::AffineTransform * transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ImagePaint__
diff --git a/libjava/gnu/java/awt/java2d/LineSegment.h b/libjava/gnu/java/awt/java2d/LineSegment.h
deleted file mode 100644
index 50f51e0..0000000
--- a/libjava/gnu/java/awt/java2d/LineSegment.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_LineSegment__
-#define __gnu_java_awt_java2d_LineSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class LineSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::LineSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  LineSegment(jdouble, jdouble, jdouble, jdouble);
-  LineSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_LineSegment__
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
deleted file mode 100644
index 07b6ac0..0000000
--- a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PixelCoverage$Bucket__
-#define __gnu_java_awt_java2d_PixelCoverage$Bucket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PixelCoverage$Bucket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PixelCoverage$Bucket : public ::java::lang::Object
-{
-
-  PixelCoverage$Bucket();
-public: // actually package-private
-  PixelCoverage$Bucket(::gnu::java::awt::java2d::PixelCoverage$Bucket *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint xCov;
-  jint yCov;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * next;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * prev;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PixelCoverage$Bucket__
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage.h b/libjava/gnu/java/awt/java2d/PixelCoverage.h
deleted file mode 100644
index 75a5057..0000000
--- a/libjava/gnu/java/awt/java2d/PixelCoverage.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PixelCoverage__
-#define __gnu_java_awt_java2d_PixelCoverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PixelCoverage;
-            class PixelCoverage$Bucket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PixelCoverage : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PixelCoverage();
-  void rewind();
-  void clear();
-  void add(jint, jint, jint);
-private:
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * findOrInsert(jint);
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * current;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * last;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PixelCoverage__
diff --git a/libjava/gnu/java/awt/java2d/Pixelizer.h b/libjava/gnu/java/awt/java2d/Pixelizer.h
deleted file mode 100644
index 469019a..0000000
--- a/libjava/gnu/java/awt/java2d/Pixelizer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Pixelizer__
-#define __gnu_java_awt_java2d_Pixelizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class Pixelizer;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Pixelizer : public ::java::lang::Object
-{
-
-public:
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_java2d_Pixelizer__
diff --git a/libjava/gnu/java/awt/java2d/PolyEdge.h b/libjava/gnu/java/awt/java2d/PolyEdge.h
deleted file mode 100644
index e51a868..0000000
--- a/libjava/gnu/java/awt/java2d/PolyEdge.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PolyEdge__
-#define __gnu_java_awt_java2d_PolyEdge__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdge;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PolyEdge : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PolyEdge();
-  PolyEdge(jint, jint, jint, jint, jint, jboolean);
-  void init(jint, jint, jint, jint, jint, jboolean);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  void intersect(jint, jint);
-public:
-  ::java::lang::String * toString();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x0;
-  jint y0;
-  jint x1;
-  jint y1;
-private:
-  jint slope;
-public: // actually package-private
-  jint xIntersection;
-  jboolean isClip;
-  ::gnu::java::awt::java2d::PolyEdge * poolNext;
-  ::gnu::java::awt::java2d::PolyEdge * scanlineNext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PolyEdge__
diff --git a/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h b/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h
deleted file mode 100644
index b27bdaf..0000000
--- a/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PolyEdgeComparator__
-#define __gnu_java_awt_java2d_PolyEdgeComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdgeComparator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PolyEdgeComparator : public ::java::lang::Object
-{
-
-public:
-  PolyEdgeComparator();
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PolyEdgeComparator__
diff --git a/libjava/gnu/java/awt/java2d/QuadSegment.h b/libjava/gnu/java/awt/java2d/QuadSegment.h
deleted file mode 100644
index 1075241..0000000
--- a/libjava/gnu/java/awt/java2d/QuadSegment.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_QuadSegment__
-#define __gnu_java_awt_java2d_QuadSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class QuadSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::QuadSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  QuadSegment(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  QuadSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  QuadSegment(::java::awt::geom::QuadCurve2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-private:
-  ::gnu::java::awt::java2d::QuadSegment * offsetSubdivided(::java::awt::geom::QuadCurve2D *, jboolean);
-  ::java::awt::geom::Point2D * lineIntersection(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jboolean);
-public:
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::Segment)))) cp;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_QuadSegment__
diff --git a/libjava/gnu/java/awt/java2d/RasterGraphics.h b/libjava/gnu/java/awt/java2d/RasterGraphics.h
deleted file mode 100644
index 37baf26..0000000
--- a/libjava/gnu/java/awt/java2d/RasterGraphics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_RasterGraphics__
-#define __gnu_java_awt_java2d_RasterGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/AbstractGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class RasterGraphics;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::RasterGraphics : public ::gnu::java::awt::java2d::AbstractGraphics2D
-{
-
-public:
-  RasterGraphics(::java::awt::image::WritableRaster *, ::java::awt::image::ColorModel *);
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::Rectangle * getDeviceBounds();
-private:
-  ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::AbstractGraphics2D)))) raster;
-  ::java::awt::image::ColorModel * colorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_RasterGraphics__
diff --git a/libjava/gnu/java/awt/java2d/Scanline.h b/libjava/gnu/java/awt/java2d/Scanline.h
deleted file mode 100644
index ce2be0e..0000000
--- a/libjava/gnu/java/awt/java2d/Scanline.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Scanline__
-#define __gnu_java_awt_java2d_Scanline__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdge;
-            class Scanline;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Scanline : public ::java::lang::Object
-{
-
-public: // actually package-private
-  virtual void clear();
-  Scanline();
-  virtual void addEdge(::gnu::java::awt::java2d::PolyEdge *);
-  virtual ::gnu::java::awt::java2d::PolyEdge * getEdges();
-private:
-  ::gnu::java::awt::java2d::PolyEdge * __attribute__((aligned(__alignof__( ::java::lang::Object)))) edges;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_Scanline__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
deleted file mode 100644
index b2da8ff..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineConverter.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineConverter__
-#define __gnu_java_awt_java2d_ScanlineConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ActiveEdges;
-            class Pixelizer;
-            class PolyEdge;
-            class Scanline;
-            class ScanlineConverter;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineConverter();
-public:
-  void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, jint, ::java::awt::RenderingHints *);
-private:
-  void clear();
-  void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean);
-  void setResolution(jint, jint);
-  void setUpperBounds(jint);
-  void addShape(::java::awt::geom::PathIterator *, jboolean);
-  void addEdge(::gnu::java::awt::java2d::PolyEdge *);
-  jint fit(jint);
-  jint scanlineIndex(jint);
-  void edgePoolAdd(jint, jint, jint, jint, jboolean);
-  static jint FIXED_DIGITS;
-  static jint ONE;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines;
-  JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines;
-  jint upperBounds;
-  jint resolution;
-  jint yResolution;
-  jint halfStep;
-  JArray< jfloat > * coords;
-  ::gnu::java::awt::java2d::ActiveEdges * activeEdges;
-  ::gnu::java::awt::java2d::PolyEdge * edgePool;
-  ::gnu::java::awt::java2d::PolyEdge * edgePoolLast;
-  jint minY;
-  jint maxY;
-  jint minX;
-  jint maxX;
-  ::gnu::java::awt::java2d::ScanlineCoverage * scanlineCoverage;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineConverter__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h
deleted file mode 100644
index 0f1a5b7..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage$Coverage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Coverage : public ::java::lang::Object
-{
-
-  ScanlineCoverage$Coverage();
-public:
-  jint getXPos();
-  jint getCoverageDelta();
-  ::java::lang::String * toString();
-  ::java::lang::String * list();
-public: // actually package-private
-  ScanlineCoverage$Coverage(::gnu::java::awt::java2d::ScanlineCoverage$Coverage *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint covDelta;
-  jint pixelCoverage;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h
deleted file mode 100644
index 2ea741e..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage;
-            class ScanlineCoverage$Coverage;
-            class ScanlineCoverage$Iterator;
-            class ScanlineCoverage$Range;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Iterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineCoverage$Iterator(::gnu::java::awt::java2d::ScanlineCoverage *);
-public:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Range * next();
-  jboolean hasNext();
-public: // actually package-private
-  void reset();
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Range * __attribute__((aligned(__alignof__( ::java::lang::Object)))) range;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentItem;
-  jint currentCoverage;
-  jboolean handledPixelCoverage;
-public: // actually package-private
-  ::gnu::java::awt::java2d::ScanlineCoverage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h
deleted file mode 100644
index 5f6ccd6..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Range__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Range__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage$Range;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Range : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineCoverage$Range();
-  void setXPos(jint);
-public:
-  jint getXPos();
-public: // actually package-private
-  void setLength(jint);
-public:
-  jint getLength();
-  jint getXPosEnd();
-public: // actually package-private
-  void setCoverage(jint);
-public:
-  jint getCoverage();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static jint access$0(::gnu::java::awt::java2d::ScanlineCoverage$Range *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint length;
-  jint coverage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Range__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage.h
deleted file mode 100644
index 46d9ae8..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage__
-#define __gnu_java_awt_java2d_ScanlineCoverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage;
-            class ScanlineCoverage$Coverage;
-            class ScanlineCoverage$Iterator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage : public ::java::lang::Object
-{
-
-public:
-  ScanlineCoverage();
-  void rewind();
-  void clear();
-  void add(jint, jint, jint);
-  jint getMaxCoverage();
-public: // actually package-private
-  void setMaxCoverage(jint);
-public:
-  jint getMaxX();
-  jint getMinX();
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * findOrInsert(jint);
-public:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterate();
-  jboolean isEmpty();
-public: // actually package-private
-  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$0(::gnu::java::awt::java2d::ScanlineCoverage *);
-  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$1(::gnu::java::awt::java2d::ScanlineCoverage *);
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * current;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentPrev;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * last;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * lastPrev;
-  jint minX;
-  jint maxX;
-  jint maxCoverage;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterator;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage__
diff --git a/libjava/gnu/java/awt/java2d/Segment.h b/libjava/gnu/java/awt/java2d/Segment.h
deleted file mode 100644
index 3e771bb..0000000
--- a/libjava/gnu/java/awt/java2d/Segment.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Segment__
-#define __gnu_java_awt_java2d_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Segment : public ::java::lang::Object
-{
-
-public:
-  Segment();
-  virtual void add(::gnu::java::awt::java2d::Segment *);
-  virtual void reverseAll();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< jdouble > * normal(jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual void reverse() = 0;
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble) = 0;
-  virtual JArray< jdouble > * cp1() = 0;
-  virtual JArray< jdouble > * cp2() = 0;
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) P1;
-  ::java::awt::geom::Point2D * P2;
-  ::gnu::java::awt::java2d::Segment * first;
-  ::gnu::java::awt::java2d::Segment * next;
-  ::gnu::java::awt::java2d::Segment * last;
-public: // actually protected
-  jdouble radius;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_Segment__
diff --git a/libjava/gnu/java/awt/java2d/ShapeCache.h b/libjava/gnu/java/awt/java2d/ShapeCache.h
deleted file mode 100644
index 1ae8ffd..0000000
--- a/libjava/gnu/java/awt/java2d/ShapeCache.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ShapeCache__
-#define __gnu_java_awt_java2d_ShapeCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ShapeCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Polygon;
-        class Rectangle;
-      namespace geom
-      {
-          class Arc2D;
-          class Ellipse2D;
-          class GeneralPath;
-          class Line2D;
-          class RoundRectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ShapeCache : public ::java::lang::Object
-{
-
-public:
-  ShapeCache();
-  ::java::awt::geom::Line2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) line;
-  ::java::awt::Rectangle * rect;
-  ::java::awt::geom::RoundRectangle2D * roundRect;
-  ::java::awt::geom::Ellipse2D * ellipse;
-  ::java::awt::geom::Arc2D * arc;
-  ::java::awt::Polygon * polygon;
-  ::java::awt::geom::GeneralPath * polyline;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ShapeCache__
diff --git a/libjava/gnu/java/awt/java2d/ShapeWrapper.h b/libjava/gnu/java/awt/java2d/ShapeWrapper.h
deleted file mode 100644
index 62c9b35..0000000
--- a/libjava/gnu/java/awt/java2d/ShapeWrapper.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ShapeWrapper__
-#define __gnu_java_awt_java2d_ShapeWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ShapeWrapper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ShapeWrapper : public ::java::lang::Object
-{
-
-public:
-  ShapeWrapper(::java::awt::Shape *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-private:
-  ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::lang::Object)))) shape;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ShapeWrapper__
diff --git a/libjava/gnu/java/awt/java2d/TextCacheKey.h b/libjava/gnu/java/awt/java2d/TextCacheKey.h
deleted file mode 100644
index 9904a6a..0000000
--- a/libjava/gnu/java/awt/java2d/TextCacheKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_TextCacheKey__
-#define __gnu_java_awt_java2d_TextCacheKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class TextCacheKey;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::TextCacheKey : public ::java::lang::Object
-{
-
-public:
-  TextCacheKey();
-  TextCacheKey(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  virtual void setString(::java::lang::String *);
-  virtual void setFontRenderContext(::java::awt::font::FontRenderContext *);
-  virtual void setFont(::java::awt::Font *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) string;
-  ::java::awt::font::FontRenderContext * fontRenderContext;
-  ::java::awt::Font * font;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_TextCacheKey__
diff --git a/libjava/gnu/java/awt/java2d/TexturePaintContext.h b/libjava/gnu/java/awt/java2d/TexturePaintContext.h
deleted file mode 100644
index 5074e62..0000000
--- a/libjava/gnu/java/awt/java2d/TexturePaintContext.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_TexturePaintContext__
-#define __gnu_java_awt_java2d_TexturePaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class TexturePaintContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class TexturePaint;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::TexturePaintContext : public ::java::lang::Object
-{
-
-public:
-  TexturePaintContext(::java::awt::TexturePaint *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *);
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-private:
-  void ensureRasterSize(jint, jint);
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::WritableRaster * paintRaster;
-  ::java::awt::geom::AffineTransform * transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_TexturePaintContext__
diff --git a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h b/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
deleted file mode 100644
index 5433933..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathDesktopPeer__
-#define __gnu_java_awt_peer_ClasspathDesktopPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class ClasspathDesktopPeer;
-            class GnomeDesktopPeer;
-            class KDEDesktopPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop$Action;
-      namespace peer
-      {
-          class DesktopPeer;
-      }
-    }
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathDesktopPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  ClasspathDesktopPeer();
-public:
-  virtual jboolean isSupported(::java::awt::Desktop$Action *);
-  virtual void browse(::java::net::URI *);
-  virtual void edit(::java::io::File *);
-  virtual void mail(::java::net::URI *);
-  virtual void mail();
-  virtual void open(::java::io::File *);
-  virtual void print(::java::io::File *);
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-  virtual void checkPermissions();
-  virtual void checkPermissions(::java::io::File *, jboolean);
-  virtual void checkPrintPermissions(::java::io::File *);
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  static ::java::awt::peer::DesktopPeer * getDesktop();
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action();
-public: // actually protected
-  static ::java::lang::String * _DEFAULT_BROWSER;
-  static ::java::lang::String * _BROWSE;
-  static ::java::lang::String * _MAIL;
-  static ::java::lang::String * _EDIT;
-  static ::java::lang::String * _PRINT;
-  static ::java::lang::String * _OPEN;
-  static ::gnu::java::awt::peer::KDEDesktopPeer * kde;
-  static ::gnu::java::awt::peer::GnomeDesktopPeer * gnome;
-  static ::gnu::java::awt::peer::ClasspathDesktopPeer * classpath;
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
-private:
-  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
deleted file mode 100644
index 7445662..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
-#define __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class ClasspathFontPeer$LRUCache;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathFontPeer$LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  ClasspathFontPeer$LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) max_entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
deleted file mode 100644
index 18ab58c..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathFontPeer__
-#define __gnu_java_awt_peer_ClasspathFontPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathToolkit;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class ClasspathFontPeer$LRUCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathFontPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  static ::gnu::java::awt::ClasspathToolkit * tk();
-  static jboolean isLogicalFontName(::java::lang::String *);
-  static ::java::lang::String * logicalFontNameToFaceName(::java::lang::String *);
-  static ::java::lang::String * faceNameToFamilyName(::java::lang::String *);
-public:
-  static void copyStyleToAttrs(jint, ::java::util::Map *);
-public: // actually protected
-  static void copyFamilyToAttrs(::java::lang::String *, ::java::util::Map *);
-public:
-  static void copySizeToAttrs(jfloat, ::java::util::Map *);
-public: // actually protected
-  static void copyTransformToAttrs(::java::awt::geom::AffineTransform *, ::java::util::Map *);
-  virtual void setStandardAttributes(::java::lang::String *, ::java::lang::String *, jint, jfloat, ::java::awt::geom::AffineTransform *);
-  virtual void setStandardAttributes(::java::lang::String *, ::java::util::Map *);
-  virtual void getStandardAttributes(::java::util::Map *);
-public:
-  ClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  ClasspathFontPeer(::java::lang::String *, jint, jint);
-  virtual ::java::lang::String * getName(::java::awt::Font *);
-  virtual ::java::lang::String * getFamily(::java::awt::Font *);
-  virtual ::java::lang::String * getFamily(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getFontName(::java::awt::Font *);
-  virtual ::java::lang::String * getFontName(::java::awt::Font *, ::java::util::Locale *);
-  virtual jfloat getSize(::java::awt::Font *);
-  virtual jboolean isPlain(::java::awt::Font *);
-  virtual jboolean isBold(::java::awt::Font *);
-  virtual jboolean isItalic(::java::awt::Font *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint, jfloat);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jfloat);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, ::java::util::Map *);
-  virtual ::java::util::Map * getAttributes(::java::awt::Font *);
-  virtual JArray< ::java::text::AttributedCharacterIterator$Attribute * > * getAvailableAttributes(::java::awt::Font *);
-  virtual ::java::awt::geom::AffineTransform * getTransform(::java::awt::Font *);
-  virtual jboolean isTransformed(::java::awt::Font *);
-  virtual jfloat getItalicAngle(::java::awt::Font *);
-  virtual jint getStyle(::java::awt::Font *);
-  virtual jboolean canDisplay(::java::awt::Font *, jint) = 0;
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint) = 0;
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *) = 0;
-  virtual jint getNumGlyphs(::java::awt::Font *) = 0;
-  virtual jint getMissingGlyphCode(::java::awt::Font *) = 0;
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar) = 0;
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint) = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *) = 0;
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *) = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) logicalName;
-  ::java::lang::String * familyName;
-  ::java::lang::String * faceName;
-  jint style;
-  jfloat size;
-  ::java::awt::geom::AffineTransform * transform;
-private:
-  static ::gnu::java::awt::peer::ClasspathFontPeer$LRUCache * transCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathFontPeer__
diff --git a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h
deleted file mode 100644
index 89b4c8b..0000000
--- a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_EmbeddedWindowPeer__
-#define __gnu_java_awt_peer_EmbeddedWindowPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class EmbeddedWindowPeer;
-        }
-      }
-    }
-  }
-  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;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::EmbeddedWindowPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void embed(jlong) = 0;
-  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 // __gnu_java_awt_peer_EmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/GLightweightPeer.h b/libjava/gnu/java/awt/peer/GLightweightPeer.h
deleted file mode 100644
index ecf0b46..0000000
--- a/libjava/gnu/java/awt/peer/GLightweightPeer.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_GLightweightPeer__
-#define __gnu_java_awt_peer_GLightweightPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GLightweightPeer;
-        }
-      }
-    }
-  }
-  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 gnu::java::awt::peer::GLightweightPeer : public ::java::lang::Object
-{
-
-public:
-  GLightweightPeer();
-  virtual ::java::awt::Insets * insets();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void hide();
-  virtual jboolean isFocusable();
-  virtual jboolean isFocusTraversable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setEventMask(jlong);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual jboolean handlesWheelScrolling();
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_GLightweightPeer__
diff --git a/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h b/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
deleted file mode 100644
index 7621bd1..0000000
--- a/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_GnomeDesktopPeer__
-#define __gnu_java_awt_peer_GnomeDesktopPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GnomeDesktopPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::java::awt::peer::GnomeDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
-{
-
-public:
-  GnomeDesktopPeer();
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-public:
-  virtual void browse(::java::net::URI *);
-public: // actually protected
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  virtual void mail();
-public: // actually protected
-  virtual ::java::lang::String * execQuery(::java::lang::String *);
-private:
-  static ::java::lang::String * BROWSER_QUERY_GNOME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_GnomeDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/KDEDesktopPeer.h b/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
deleted file mode 100644
index 1d6448b..0000000
--- a/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_KDEDesktopPeer__
-#define __gnu_java_awt_peer_KDEDesktopPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class KDEDesktopPeer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::KDEDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
-{
-
-public:
-  KDEDesktopPeer();
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  virtual void mail();
-public: // actually protected
-  virtual ::java::lang::String * execQuery(::java::lang::String *);
-private:
-  static ::java::lang::String * BROWSER_QUERY_GNOME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_KDEDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h b/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h
deleted file mode 100644
index 48a10a7..0000000
--- a/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_NativeEventLoopRunningEvent__
-#define __gnu_java_awt_peer_NativeEventLoopRunningEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class NativeEventLoopRunningEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::NativeEventLoopRunningEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  NativeEventLoopRunningEvent(::java::lang::Object *);
-  virtual jboolean isRunning();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) running;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_NativeEventLoopRunningEvent__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h
deleted file mode 100644
index aa276f4..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage$Loader__
-#define __gnu_java_awt_peer_gtk_AsyncImage$Loader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-              class AsyncImage$Loader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage$Loader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AsyncImage$Loader(::gnu::java::awt::peer::gtk::AsyncImage *, ::java::net::URL *);
-public:
-  virtual void run();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) url;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage$Loader__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h
deleted file mode 100644
index 86bfeae..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
-#define __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-              class AsyncImage$NullImageSource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage$NullImageSource : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AsyncImage$NullImageSource(::gnu::java::awt::peer::gtk::AsyncImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage.h
deleted file mode 100644
index d1735ea..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage__
-#define __gnu_java_awt_peer_gtk_AsyncImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage : public ::java::awt::Image
-{
-
-public: // actually package-private
-  AsyncImage(::java::net::URL *);
-public:
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  virtual void addObserver(::java::awt::image::ImageObserver *);
-  static ::java::awt::Image * realImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual void notifyObservers(jint);
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage__;
-  ::java::util::HashSet * observers;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
deleted file mode 100644
index 032eb27..0000000
--- a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_BufferedImageGraphics__
-#define __gnu_java_awt_peer_gtk_BufferedImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class BufferedImageGraphics;
-              class CairoSurface;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::BufferedImageGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public:
-  BufferedImageGraphics(::java::awt::image::BufferedImage *);
-public: // actually package-private
-  BufferedImageGraphics(::gnu::java::awt::peer::gtk::BufferedImageGraphics *);
-private:
-  void updateBufferedImage(jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-private:
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) image;
-  ::java::awt::image::BufferedImage * buffer;
-  jint imageWidth;
-  jint imageHeight;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::CairoSurface * surface;
-  static ::java::util::WeakHashMap * bufferedImages;
-private:
-  jlong cairo_t;
-  jboolean hasFastCM;
-  jboolean hasAlpha;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_BufferedImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
deleted file mode 100644
index 5d5ee49..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
+++ /dev/null
@@ -1,279 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__
-#define __gnu_java_awt_peer_gtk_CairoGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoGraphics2D;
-              class CairoSurface;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BasicStroke;
-        class Color;
-        class Composite;
-        class CompositeContext;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-          class ImageObserver;
-          class Raster;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoGraphics2D : public ::java::awt::Graphics2D
-{
-
-public:
-  CairoGraphics2D();
-  virtual void setup(jlong);
-  virtual void copy(::gnu::java::awt::peer::gtk::CairoGraphics2D *, jlong);
-  virtual void finalize();
-  virtual void dispose();
-public: // actually protected
-  virtual jlong init(jlong);
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-public: // actually protected
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds() = 0;
-public:
-  virtual void disposeNative(jlong);
-public: // actually protected
-  virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint);
-  virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint);
-  virtual void cairoSetMatrix(jlong, JArray< jdouble > *);
-  virtual void cairoScale(jlong, jdouble, jdouble);
-  virtual void cairoSetOperator(jlong, jint);
-  virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSetFillRule(jlong, jint);
-  virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
-  virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-  virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *, JArray< jlong > *);
-  virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *);
-  virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSave(jlong);
-  virtual void cairoRestore(jlong);
-  virtual void cairoNewPath(jlong);
-  virtual void cairoClosePath(jlong);
-  virtual void cairoMoveTo(jlong, jdouble, jdouble);
-  virtual void cairoLineTo(jlong, jdouble, jdouble);
-  virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoStroke(jlong);
-  virtual void cairoFill(jlong, jdouble);
-  virtual void cairoClip(jlong);
-  virtual void cairoResetClip(jlong);
-  virtual void cairoSetAntialias(jlong, jboolean);
-public:
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-private:
-  void setTransformImpl(::java::awt::geom::AffineTransform *);
-public:
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void translate(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void shear(jdouble, jdouble);
-  virtual void clip(::java::awt::Shape *);
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setPaint(::java::awt::Paint *);
-public: // actually protected
-  virtual void setCustomPaint(::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void setStroke(::java::awt::Stroke *);
-public: // actually protected
-  virtual ::java::awt::Rectangle * findStrokedBounds(::java::awt::Shape *);
-public:
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void setColor(::java::awt::Color *);
-public: // actually package-private
-  virtual void updateColor();
-public:
-  virtual ::java::awt::Color * getColor();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getClipInDevSpace();
-public:
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setComposite(::java::awt::Composite *);
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM() = 0;
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-public:
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-private:
-  void createPath(::java::awt::Shape *, jboolean);
-public:
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-private:
-  jint getInterpolation();
-  void setAntialias(jboolean);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
-public:
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Font * getFont();
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  jboolean drawRaster(::java::awt::image::ColorModel *, ::java::awt::image::Raster *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *);
-  jdouble shiftX(jdouble, jboolean);
-  jdouble shiftY(jdouble, jboolean);
-  void walkPath(::java::awt::geom::PathIterator *, jboolean);
-  ::java::util::Map * getDefaultHints();
-public:
-  static JArray< jint > * findSimpleIntegerArray(::java::awt::image::ColorModel *, ::java::awt::image::Raster *);
-private:
-  void updateClip(::java::awt::geom::AffineTransform *);
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-public: // actually package-private
-  static ::java::awt::geom::Rectangle2D * getTransformedBounds(::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *);
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativePointer;
-  ::java::awt::Paint * paint;
-  jboolean customPaint;
-  ::java::awt::Stroke * stroke;
-  ::java::awt::Color * fg;
-  ::java::awt::Color * bg;
-  ::java::awt::Shape * clip__;
-  ::java::awt::geom::AffineTransform * transform__;
-  ::java::awt::Font * font;
-  ::java::awt::Composite * comp;
-  ::java::awt::CompositeContext * compCtx;
-private:
-  ::java::awt::RenderingHints * hints;
-  jboolean antialias;
-  jboolean ignoreAA;
-public: // actually protected
-  jboolean shiftDrawCalls;
-private:
-  jboolean firstClip;
-  ::java::awt::Shape * originalClip;
-  static ::java::awt::BasicStroke * draw3DRectStroke;
-public: // actually package-private
-  static ::java::awt::image::ColorModel * rgb32;
-  static ::java::awt::image::ColorModel * argb32;
-public:
-  static const jint INTERPOLATION_NEAREST = 0;
-  static const jint INTERPOLATION_BILINEAR = 1;
-  static const jint INTERPOLATION_BICUBIC = 5;
-  static const jint ALPHA_INTERPOLATION_SPEED = 2;
-  static const jint ALPHA_INTERPOLATION_QUALITY = 3;
-  static const jint ALPHA_INTERPOLATION_DEFAULT = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoGraphics2D__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
deleted file mode 100644
index 7e34ee9..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurface__
-#define __gnu_java_awt_peer_gtk_CairoSurface__
-
-#pragma interface
-
-#include <java/awt/image/WritableRaster.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster
-{
-
-  void create(jint, jint, jint, JArray< jint > *);
-  void destroy(jlong, JArray< jint > *);
-public:
-  virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint);
-public: // actually package-private
-  virtual void syncNativeToJava(jlong, JArray< jint > *);
-  virtual void syncJavaToNative(jlong, JArray< jint > *);
-  virtual jlong getFlippedBuffer(jlong);
-public:
-  CairoSurface(jint, jint);
-  CairoSurface(jint, jint, jint, jint);
-  CairoSurface(::java::awt::image::SampleModel *, ::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::Rectangle *, ::java::awt::Point *);
-public: // actually package-private
-  CairoSurface(::gnu::java::awt::peer::gtk::GtkImage *);
-public:
-  virtual void dispose();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
-  virtual JArray< jint > * getData();
-  static ::java::awt::image::BufferedImage * getBufferedImage(jint, jint);
-  static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::GtkImage *);
-  static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::CairoSurface *);
-  virtual ::java::awt::Graphics2D * getGraphics();
-public: // actually package-private
-  virtual jlong nativeNewCairoContext(jlong);
-public:
-  virtual jlong newCairoContext();
-  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint);
-public: // actually protected
-  static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint);
-public:
-  static jboolean isCompatibleColorModel(::java::awt::image::ColorModel *);
-  static jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width;
-  jint height;
-  jlong surfacePointer;
-  jboolean sharedBuffer;
-  static ::java::awt::image::ColorModel * cairoColorModel;
-  static ::java::awt::image::ColorModel * cairoCM_pre;
-  static ::java::awt::image::ColorModel * cairoCM_opaque;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurface__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h b/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h
deleted file mode 100644
index 938da7b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
-#define __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class CairoSurfaceGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurfaceGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public:
-  CairoSurfaceGraphics(::gnu::java::awt::peer::gtk::CairoSurface *);
-private:
-  CairoSurfaceGraphics(::gnu::java::awt::peer::gtk::CairoSurfaceGraphics *);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-  ::gnu::java::awt::peer::gtk::CairoSurface * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) surface;
-private:
-  ::java::awt::image::BufferedImage * buffer;
-  jlong cairo_t;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
deleted file mode 100644
index a9b70e7..0000000
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
-#define __gnu_java_awt_peer_gtk_ComponentGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class ComponentGraphics;
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::ComponentGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public: // actually package-private
-  ComponentGraphics();
-private:
-  ComponentGraphics(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  ComponentGraphics(::gnu::java::awt::peer::gtk::ComponentGraphics *);
-  jlong initState(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  void lock();
-  void unlock();
-public: // actually protected
-  virtual jlong initFromVolatile(jlong);
-private:
-  void start_gdk_drawing();
-  void end_gdk_drawing();
-public:
-  static jboolean hasXRender();
-private:
-  static ::gnu::classpath::Pointer * nativeGrab(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  void copyAreaNative(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint, jint, jint, jint, jint);
-  void drawVolatile(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jlong, jint, jint, jint, jint, jint, jint, jint, jint);
-public:
-  static ::gnu::java::awt::peer::gtk::GtkImage * grab(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  static ::java::awt::Graphics2D * getComponentGraphics(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::Graphics * create();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual jlong init(jlong);
-  virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint);
-  virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint);
-  virtual void cairoSetMatrix(jlong, JArray< jdouble > *);
-  virtual void cairoScale(jlong, jdouble, jdouble);
-  virtual void cairoSetOperator(jlong, jint);
-  virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSetFillRule(jlong, jint);
-  virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
-  virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-  virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSave(jlong);
-  virtual void cairoRestore(jlong);
-  virtual void cairoNewPath(jlong);
-  virtual void cairoClosePath(jlong);
-  virtual void cairoMoveTo(jlong, jdouble, jdouble);
-  virtual void cairoLineTo(jlong, jdouble, jdouble);
-  virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoStroke(jlong);
-  virtual void cairoFill(jlong, jdouble);
-  virtual void cairoClip(jlong);
-  virtual void cairoResetClip(jlong);
-  virtual void cairoSetAntialias(jlong, jboolean);
-  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
-private:
-  static jboolean hasXRenderExtension;
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) component;
-public: // actually protected
-  jlong cairo_t;
-private:
-  ::java::awt::image::BufferedImage * buffer;
-  ::java::awt::image::BufferedImage * componentBuffer;
-  static ::java::lang::ThreadLocal * hasLock;
-  static ::java::lang::Integer * ONE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_ComponentGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h
deleted file mode 100644
index 7ba10f8..0000000
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
-#define __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class ComponentGraphicsCopy;
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::ComponentGraphicsCopy : public ::gnu::java::awt::peer::gtk::CairoSurfaceGraphics
-{
-
-public: // actually package-private
-  virtual void getPixbuf(::gnu::java::awt::peer::gtk::GtkComponentPeer *, ::gnu::java::awt::peer::gtk::GtkImage *);
-  virtual void copyPixbuf(::gnu::java::awt::peer::gtk::GtkComponentPeer *, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint, jint, jint);
-public:
-  ComponentGraphicsCopy(jint, jint, ::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoSurfaceGraphics)))) component;
-  ::gnu::java::awt::peer::gtk::GtkImage * gtkimage;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
deleted file mode 100644
index 3f7a629..0000000
--- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
-#define __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
-
-#pragma interface
-
-#include <java/awt/font/GlyphVector.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class FreetypeGlyphVector;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::FreetypeGlyphVector : public ::java::awt::font::GlyphVector
-{
-
-  void dispose(JArray< jlong > *);
-  jlong getNativeFontPointer(jint);
-public:
-  FreetypeGlyphVector(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  FreetypeGlyphVector(::java::awt::Font *, JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *, jint);
-  FreetypeGlyphVector(::java::awt::Font *, JArray< jint > *, ::java::awt::font::FontRenderContext *);
-private:
-  FreetypeGlyphVector(::gnu::java::awt::peer::gtk::FreetypeGlyphVector *);
-public:
-  virtual void finalize();
-private:
-  void getGlyphs();
-public:
-  virtual void getGlyphs(JArray< jint > *, JArray< jint > *, JArray< jlong > *);
-private:
-  void getKerning(jint, jint, jlong, JArray< jfloat > *);
-  JArray< jdouble > * getMetricsNative(jint, jlong);
-  ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint, jlong);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::font::GlyphVector *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void performDefaultLayout();
-  virtual jint getGlyphCode(jint);
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *);
-public: // actually protected
-  virtual JArray< jlong > * getGlyphFonts(jint, jint, JArray< jlong > *);
-public:
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint);
-  virtual void setupGlyphMetrics();
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *);
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
-public: // actually protected
-  virtual jboolean hasTransforms();
-public:
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint);
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds();
-  virtual jint getNumGlyphs();
-  virtual ::java::awt::Shape * getOutline();
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint);
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds();
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *);
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *);
-private:
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::GlyphVector)))) font;
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * peer;
-  ::java::awt::geom::Rectangle2D * logicalBounds;
-  JArray< jfloat > * glyphPositions;
-  ::java::lang::String * s;
-  ::java::awt::font::FontRenderContext * frc;
-  jint nGlyphs;
-  JArray< jint > * glyphCodes;
-  JArray< jlong > * fontSet;
-  JArray< ::java::awt::geom::AffineTransform * > * glyphTransforms;
-  JArray< ::java::awt::font::GlyphMetrics * > * metricsCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h
deleted file mode 100644
index 508a37d..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
-
-#pragma interface
-
-#include <java/awt/font/LineMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontLineMetrics;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontLineMetrics : public ::java::awt::font::LineMetrics
-{
-
-public:
-  GdkFontPeer$GdkFontLineMetrics(::gnu::java::awt::peer::gtk::GdkFontPeer *, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jint);
-  virtual jfloat getAscent();
-  virtual jint getBaselineIndex();
-  virtual JArray< jfloat > * getBaselineOffsets();
-  virtual jfloat getDescent();
-  virtual jfloat getHeight();
-  virtual jfloat getLeading();
-  virtual jint getNumChars();
-  virtual jfloat getStrikethroughOffset();
-  virtual jfloat getStrikethroughThickness();
-  virtual jfloat getUnderlineOffset();
-  virtual jfloat getUnderlineThickness();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) nchars;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h
deleted file mode 100644
index 0c9961b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontMetrics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics : public ::java::awt::FontMetrics
-{
-
-public:
-  GdkFontPeer$GdkFontMetrics(::gnu::java::awt::peer::gtk::GdkFontPeer *, ::java::awt::Font *);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint getHeight();
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getMaxAscent();
-  virtual jint getDescent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxAdvance();
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
deleted file mode 100644
index ebfdd2c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontMetrics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphMetrics;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public: // actually package-private
-  static void initStaticState();
-private:
-  void initState();
-  void dispose();
-  void setFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void getFontMetrics(JArray< jdouble > *);
-  virtual void getTextMetrics(::java::lang::String *, JArray< jdouble > *);
-  virtual void releasePeerGraphicsResource();
-public: // actually protected
-  virtual void finalize();
-private:
-  ::java::lang::String * buildString(::java::text::CharacterIterator *);
-  ::java::lang::String * buildString(::java::text::CharacterIterator *, jint, jint);
-  ::java::lang::String * buildString(JArray< jchar > *, jint, jint);
-public:
-  GdkFontPeer(::java::lang::String *, jint);
-  GdkFontPeer(::java::lang::String *, jint, jint);
-  GdkFontPeer(::java::lang::String *, ::java::util::Map *);
-public: // actually package-private
-  static ::java::awt::Font * initFont(::java::awt::Font *);
-private:
-  void setupMetrics();
-public:
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-private:
-  JArray< jbyte > * getTrueTypeTable(jbyte, jbyte, jbyte, jbyte);
-public:
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-private:
-  ::java::lang::String * getName(jint, ::java::util::Locale *);
-public:
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually package-private
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual void putGlyphMetrics(jint, ::java::awt::font::GlyphMetrics *);
-  static ::java::awt::font::FontRenderContext * DEFAULT_CTX;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) textLayoutCache;
-private:
-  jint native_state;
-  ::java::util::HashMap * metricsCache;
-  static const jint FONT_METRICS_ASCENT = 0;
-  static const jint FONT_METRICS_MAX_ASCENT = 1;
-  static const jint FONT_METRICS_DESCENT = 2;
-  static const jint FONT_METRICS_MAX_DESCENT = 3;
-  static const jint FONT_METRICS_MAX_ADVANCE = 4;
-  static const jint FONT_METRICS_HEIGHT = 5;
-  static const jint FONT_METRICS_UNDERLINE_OFFSET = 6;
-  static const jint FONT_METRICS_UNDERLINE_THICKNESS = 7;
-public: // actually package-private
-  jfloat ascent;
-  jfloat descent;
-  jfloat maxAscent;
-  jfloat maxDescent;
-  jfloat maxAdvance;
-  jfloat height;
-  jfloat underlineOffset;
-  jfloat underlineThickness;
-  ::gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics * metrics;
-private:
-  ::java::nio::ByteBuffer * nameTable;
-  ::gnu::classpath::Pointer * nativeFont;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h
deleted file mode 100644
index d36580f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
-#define __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
-
-#pragma interface
-
-#include <java/awt/GraphicsConfiguration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsConfiguration;
-              class GdkScreenGraphicsDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkGraphicsConfiguration : public ::java::awt::GraphicsConfiguration
-{
-
-public:
-  GdkGraphicsConfiguration(::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice *);
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::ColorModel * getColorModel(jint);
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform();
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::BufferCapabilities * getBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getImageCapabilities();
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * __attribute__((aligned(__alignof__( ::java::awt::GraphicsConfiguration)))) gdkScreenGraphicsDevice;
-  ::java::awt::image::ColorModel * opaqueColorModel;
-  ::java::awt::image::ColorModel * bitmaskColorModel;
-  ::java::awt::image::ColorModel * translucentColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
deleted file mode 100644
index 978c2ec..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
-#define __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathGraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsEnvironment;
-              class GdkScreenGraphicsDevice;
-              class GtkWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment
-{
-
-  static void initIDs();
-public:
-  GdkGraphicsEnvironment();
-public: // actually package-private
-  virtual void nativeInitState();
-public:
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-private:
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * nativeGetScreenDevices();
-public:
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-private:
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * nativeGetDefaultScreenDevice();
-public:
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-private:
-  jint nativeGetNumFontFamilies();
-  void nativeGetFontFamilies(JArray< ::java::lang::String * > *);
-public:
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-public: // actually package-private
-  virtual JArray< jint > * getMouseCoordinates();
-  virtual jboolean isWindowUnderMouse(::gnu::java::awt::peer::gtk::GtkWindowPeer *);
-public:
-  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathGraphicsEnvironment)))) native_state;
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice;
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices;
-  ::gnu::classpath::Pointer * display;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h
deleted file mode 100644
index 197639f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder;
-              class GdkPixbufDecoder$GdkPixbufReader;
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReader : public ::javax::imageio::ImageReader
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufReader(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi *, ::java::lang::Object *);
-  GdkPixbufDecoder$GdkPixbufReader(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi *, ::java::lang::Object *, ::gnu::java::awt::peer::gtk::GdkPixbufDecoder *);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-  virtual ::java::awt::image::BufferedImage * getBufferedImage();
-  virtual jint getNumImages(jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getHeight(jint);
-  virtual jint getWidth(jint);
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkPixbufDecoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) dec;
-  ::java::awt::image::BufferedImage * bufferedImage;
-  ::java::awt::image::ColorModel * defaultModel;
-  jint width;
-  jint height;
-  ::java::lang::String * ext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h
deleted file mode 100644
index 1181671..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufReaderSpi();
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h
deleted file mode 100644
index d88b2ae..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufWriter;
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriter : public ::javax::imageio::ImageWriter
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufWriter(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi *, ::java::lang::Object *);
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *);
-  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  void write(JArray< jbyte > *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriter)))) ext;
-private:
-  static ::java::lang::Object * DATADONE;
-  ::java::util::ArrayList * data;
-  ::java::io::IOException * exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h
deleted file mode 100644
index d8ac5af..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageWriterSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-        class ImageWriter;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi : public ::javax::imageio::spi::ImageWriterSpi
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufWriterSpi();
-  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *);
-  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h
deleted file mode 100644
index 03316f5..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$ImageFormatSpec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$ImageFormatSpec : public ::java::lang::Object
-{
-
-public:
-  GdkPixbufDecoder$ImageFormatSpec(::java::lang::String *, jboolean);
-  virtual void addMimeType(::java::lang::String *);
-  virtual void addExtension(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jboolean writable;
-  ::java::util::ArrayList * mimeTypes;
-  ::java::util::ArrayList * extensions;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
deleted file mode 100644
index 1c5fa79..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
-
-#pragma interface
-
-#include <gnu/java/awt/image/ImageDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder;
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-              class GdkPixbufDecoder$GdkPixbufWriter;
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-              class GdkPixbufDecoder$ImageFormatSpec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder : public ::gnu::java::awt::image::ImageDecoder
-{
-
-public: // actually package-private
-  static void initStaticState();
-  virtual void initState();
-  virtual void pumpBytes(JArray< jbyte > *, jint);
-  virtual void pumpDone();
-  virtual void finish(jboolean);
-  static void streamImage(JArray< jint > *, ::java::lang::String *, jint, jint, jboolean, ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriter *);
-public:
-  GdkPixbufDecoder(::java::io::DataInput *);
-  GdkPixbufDecoder(::java::io::InputStream *);
-  GdkPixbufDecoder(::java::lang::String *);
-  GdkPixbufDecoder(::java::net::URL *);
-  GdkPixbufDecoder(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual void areaPrepared(jint, jint);
-  virtual void areaUpdated(jint, jint, jint, jint, JArray< jint > *, jint);
-public:
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *);
-  virtual void finalize();
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$ImageFormatSpec * registerFormat(::java::lang::String *, jboolean);
-public: // actually package-private
-  static JArray< ::java::lang::String * > * getFormatNames(jboolean);
-  static JArray< ::java::lang::String * > * getFormatExtensions(jboolean);
-  static JArray< ::java::lang::String * > * getFormatMimeTypes(jboolean);
-  static ::java::lang::String * findFormatName(::java::lang::Object *, jboolean);
-public:
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi * getReaderSpi();
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi * getWriterSpi();
-  static void registerSpis(::javax::imageio::spi::IIORegistry *);
-public: // actually package-private
-  static ::java::lang::Object * pixbufLock;
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::image::ImageDecoder)))) native_state;
-  jboolean needsClose;
-public: // actually package-private
-  ::java::util::Vector * curr;
-private:
-  ::gnu::classpath::Pointer * nativeDecoder;
-public: // actually package-private
-  static ::java::awt::image::ColorModel * cm;
-  static ::java::util::ArrayList * imageFormatSpecs;
-private:
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi * readerSpi;
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi * writerSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
deleted file mode 100644
index 24c6a85..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkRobotPeer__
-#define __gnu_java_awt_peer_gtk_GdkRobotPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkRobotPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkRobotPeer : public ::java::lang::Object
-{
-
-public:
-  GdkRobotPeer(::java::awt::GraphicsDevice *);
-public: // actually package-private
-  virtual jboolean initXTest();
-public:
-  virtual void mouseMove(jint, jint);
-  virtual void mousePress(jint);
-  virtual void mouseRelease(jint);
-  virtual void mouseWheel(jint);
-  virtual void keyPress(jint);
-  virtual void keyRelease(jint);
-public: // actually package-private
-  virtual JArray< jint > * nativeGetRGBPixels(jint, jint, jint, jint);
-public:
-  virtual jint getRGBPixel(jint, jint);
-  virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *);
-  virtual void dispose();
-public: // actually package-private
-  static ::java::awt::image::ColorModel * cm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkRobotPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h
deleted file mode 100644
index 5c27e4c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
-#define __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkScreenGraphicsDevice$X11DisplayMode;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GdkScreenGraphicsDevice$X11DisplayMode(jint, jint, JArray< jshort > *);
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rates;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
deleted file mode 100644
index ff0362b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
-#define __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
-
-#pragma interface
-
-#include <java/awt/GraphicsDevice.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsConfiguration;
-              class GdkGraphicsEnvironment;
-              class GdkScreenGraphicsDevice;
-              class GdkScreenGraphicsDevice$X11DisplayMode;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfiguration;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice : public ::java::awt::GraphicsDevice
-{
-
-public: // actually package-private
-  static void initIDs();
-  GdkScreenGraphicsDevice(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-  virtual void init();
-  virtual ::java::awt::DisplayMode * nativeGetFixedDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual jint getType();
-  virtual ::java::lang::String * getIDstring();
-private:
-  ::java::lang::String * nativeGetIDString();
-public:
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations();
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration();
-  virtual ::java::awt::DisplayMode * getDisplayMode();
-public: // actually package-private
-  virtual jint nativeGetDisplayModeIndex(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-  virtual jint nativeGetDisplayModeRate(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual JArray< ::java::awt::DisplayMode * > * getDisplayModes();
-public: // actually package-private
-  virtual JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * nativeGetDisplayModes(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual jboolean isFullScreenSupported();
-  virtual jboolean isDisplayChangeSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-public: // actually package-private
-  virtual void nativeSetDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *, jint, jshort);
-public:
-  virtual void setFullScreenWindow(::java::awt::Window *);
-  virtual ::java::awt::Window * getFullScreenWindow();
-public: // actually package-private
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * nativeGetBounds();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsDevice)))) native_state;
-  ::java::awt::Window * fullscreenWindow;
-  jboolean oldWindowDecorationState;
-  ::java::awt::Rectangle * oldWindowBounds;
-  ::java::awt::Rectangle * bounds;
-  JArray< ::gnu::java::awt::peer::gtk::GdkGraphicsConfiguration * > * configurations;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment * env;
-  ::java::lang::String * idString;
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * displayModes;
-  ::java::awt::DisplayMode * fixedDisplayMode;
-private:
-  ::gnu::classpath::Pointer * screen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h
deleted file mode 100644
index 6abd267..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkButtonPeer__
-#define __gnu_java_awt_peer_gtk_GtkButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkButtonPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkButtonPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(::java::lang::String *);
-public:
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkSetLabel(::java::lang::String *);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkActivate();
-  virtual void gtkWidgetRequestFocus();
-  virtual void setNativeBounds(jint, jint, jint, jint);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-public:
-  GtkButtonPeer(::java::awt::Button *);
-public: // actually package-private
-  virtual void create();
-public:
-  virtual void setLabel(::java::lang::String *);
-public: // actually package-private
-  virtual void postActionEvent(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h
deleted file mode 100644
index 3808c2f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCanvasPeer__
-#define __gnu_java_awt_peer_gtk_GtkCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCanvasPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Dimension;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCanvasPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-public:
-  GtkCanvasPeer(::java::awt::Canvas *);
-  virtual ::java::awt::Dimension * preferredSize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h
deleted file mode 100644
index 2a2f455..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
-#define __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuItemPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCheckboxMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class CheckboxMenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCheckboxMenuItemPeer : public ::gnu::java::awt::peer::gtk::GtkMenuItemPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-public:
-  GtkCheckboxMenuItemPeer(::java::awt::CheckboxMenuItem *);
-  virtual void setState(jboolean);
-public: // actually protected
-  virtual void postMenuActionEvent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h
deleted file mode 100644
index e97d21f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
-#define __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCheckboxPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCheckboxPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  virtual void createCheckButton();
-  virtual void createRadioButton(jlong);
-  virtual void addToGroup(jlong);
-  virtual void removeFromGroup();
-  virtual void switchToGroup(jlong);
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkButtonSetLabel(::java::lang::String *);
-  virtual void gtkToggleButtonSetActive(jboolean);
-public:
-  GtkCheckboxPeer(::java::awt::Checkbox *);
-  virtual void create();
-  virtual void setState(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void postItemEvent(::java::lang::Object *, jboolean);
-  virtual void addToGroupMap(jlong);
-  virtual void dispose();
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) current_group;
-private:
-  jboolean currentState;
-  static ::java::util::WeakHashMap * groupMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h
deleted file mode 100644
index 632fb40..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkChoicePeer__
-#define __gnu_java_awt_peer_gtk_GtkChoicePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkChoicePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Choice;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkChoicePeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  GtkChoicePeer(::java::awt::Choice *);
-public: // actually package-private
-  virtual void create();
-  virtual jint nativeGetSelected();
-  virtual void connectSignals();
-  virtual void selectNative(jint);
-  virtual void selectNativeUnlocked(jint);
-public:
-  virtual void add(::java::lang::String *, jint);
-public: // actually package-private
-  virtual void nativeRemove(jint);
-  virtual void nativeRemoveAll();
-public:
-  virtual void select(jint);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void addItem(::java::lang::String *, jint);
-public: // actually protected
-  virtual void postChoiceItemEvent(jint);
-public:
-  virtual void handleEvent(::java::awt::AWTEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) selected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkChoicePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h b/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h
deleted file mode 100644
index 24b275a..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkClipboard__
-#define __gnu_java_awt_peer_gtk_GtkClipboard__
-
-#pragma interface
-
-#include <java/awt/datatransfer/Clipboard.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class ClipboardOwner;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkClipboard : public ::java::awt::datatransfer::Clipboard
-{
-
-  GtkClipboard(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * getClipboardInstance();
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * getSelectionInstance();
-private:
-  void setSystemContents(jboolean);
-public:
-  virtual void setContents(::java::awt::datatransfer::Transferable *, ::java::awt::datatransfer::ClipboardOwner *);
-private:
-  void advertiseContent(JArray< ::java::lang::String * > *, jboolean, jboolean, jboolean);
-  ::java::lang::String * provideText();
-  ::gnu::java::awt::peer::gtk::GtkImage * provideImage();
-  JArray< ::java::lang::String * > * provideURIs();
-  JArray< jbyte > * provideContent(::java::lang::String *);
-  static jboolean initNativeState(::gnu::java::awt::peer::gtk::GtkClipboard *, ::gnu::java::awt::peer::gtk::GtkClipboard *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * clipboard;
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * selection;
-  static ::java::lang::String * stringMimeType;
-  static ::java::lang::String * imageMimeType;
-  static ::java::lang::String * filesMimeType;
-  static jboolean canCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkClipboard__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h b/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h
deleted file mode 100644
index 59d04d0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
-#define __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkClipboardNotifier;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkClipboardNotifier : public ::java::lang::Thread
-{
-
-  GtkClipboardNotifier();
-public: // actually package-private
-  static void announce(::gnu::java::awt::peer::gtk::GtkClipboard *);
-public:
-  virtual void run();
-private:
-  static jboolean announceClipboardChange;
-  static jboolean announcePrimaryChange;
-  static ::gnu::java::awt::peer::gtk::GtkClipboardNotifier * notifier;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h
deleted file mode 100644
index c556b52..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
-#define __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer$RepaintTimerTask;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkComponentPeer$RepaintTimerTask : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  GtkComponentPeer$RepaintTimerTask(::java::awt::Component *, jint, jint, jint, jint);
-public:
-  virtual void run();
-public: // actually package-private
-  static void schedule(jlong, jint, jint, jint, jint, ::java::awt::Component *);
-private:
-  static ::java::util::Timer * repaintTimer;
-  jint __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) x;
-  jint y;
-  jint width;
-  jint height;
-  ::java::awt::Component * awtComponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
deleted file mode 100644
index 78c7127..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
+++ /dev/null
@@ -1,208 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkComponentPeer__
-#define __gnu_java_awt_peer_gtk_GtkComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  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;
-        class Window;
-      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 gnu::java::awt::peer::gtk::GtkComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually package-private
-  virtual jboolean isEnabled();
-  static jboolean modalHasGrab();
-  virtual JArray< jint > * gtkWidgetGetForeground();
-  virtual JArray< jint > * gtkWidgetGetBackground();
-  virtual void gtkWidgetGetDimensions(JArray< jint > *);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-  virtual void gtkWindowGetLocationOnScreen(JArray< jint > *);
-  virtual void gtkWindowGetLocationOnScreenUnlocked(JArray< jint > *);
-  virtual void gtkWidgetGetLocationOnScreen(JArray< jint > *);
-  virtual void gtkWidgetGetLocationOnScreenUnlocked(JArray< jint > *);
-  virtual void gtkWidgetSetCursor(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
-  virtual void gtkWidgetSetCursorUnlocked(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-  virtual void gtkWidgetSetSensitive(jboolean);
-  virtual void gtkWidgetSetParent(::java::awt::peer::ComponentPeer *);
-  virtual void gtkWidgetRequestFocus();
-  virtual void gtkWidgetDispatchKeyEvent(jint, jlong, jint, jint, jint);
-  virtual jboolean gtkWidgetHasFocus();
-  virtual jboolean gtkWidgetCanFocus();
-  virtual void realize();
-  virtual void setNativeEventMask();
-  virtual void create();
-  virtual void connectSignals();
-public: // actually protected
-  GtkComponentPeer(::java::awt::Component *);
-public: // actually package-private
-  virtual void setParentAndBounds();
-  virtual void setParent();
-  virtual void setComponentBounds();
-  virtual void setVisibleAndEnabled();
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void enable();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void paintComponent(::java::awt::event::PaintEvent *);
-  virtual void updateComponent(::java::awt::event::PaintEvent *);
-public:
-  virtual jboolean isFocusTraversable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-public: // actually package-private
-  virtual void setNativeBounds(jint, jint, jint, jint);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void setCursor();
-public:
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setVisibleNative(jboolean);
-  virtual void setVisibleNativeUnlocked(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void hide();
-  virtual void show();
-public: // actually protected
-  virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean);
-  virtual void postMouseWheelEvent(jint, jlong, jint, jint, jint, jint, jboolean, jint, jint, jint);
-  virtual void postExposeEvent(jint, jint, jint, jint);
-  virtual void postKeyEvent(jint, jlong, jint, jint, jchar, jint);
-  virtual void postFocusEvent(jint, jboolean);
-  virtual void postItemEvent(::java::lang::Object *, jint);
-  virtual void postTextEvent();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual void setEventMask(jlong);
-  virtual jboolean isFocusable();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-private:
-  ::java::awt::Window * getWindowFor(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isLightweightDescendant(::java::awt::Component *);
-public:
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual jboolean handlesWheelScrolling();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually package-private
-  ::java::awt::image::VolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) backBuffer;
-  ::java::awt::BufferCapabilities * caps;
-  ::java::awt::Component * awtComponent;
-  ::java::awt::Insets * insets;
-private:
-  ::java::awt::Rectangle * currentPaintArea;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h
deleted file mode 100644
index 6097fc8..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkContainerPeer__
-#define __gnu_java_awt_peer_gtk_GtkContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkContainerPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Container;
-        class Font;
-        class Insets;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkContainerPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  GtkContainerPeer(::java::awt::Container *);
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setFont(::java::awt::Font *);
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual void setBackground(::java::awt::Color *);
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-public: // actually package-private
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCursor.h b/libjava/gnu/java/awt/peer/gtk/GtkCursor.h
deleted file mode 100644
index c0e6375..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCursor.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCursor__
-#define __gnu_java_awt_peer_gtk_GtkCursor__
-
-#pragma interface
-
-#include <java/awt/Cursor.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCursor;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-        class Point;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCursor : public ::java::awt::Cursor
-{
-
-public: // actually package-private
-  GtkCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-  virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
-  virtual ::java::awt::Point * getHotspot();
-private:
-  ::gnu::java::awt::peer::gtk::GtkImage * __attribute__((aligned(__alignof__( ::java::awt::Cursor)))) image;
-  ::java::awt::Point * hotspot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCursor__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h
deleted file mode 100644
index d143f47..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkDialogPeer__
-#define __gnu_java_awt_peer_gtk_GtkDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkDialogPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkDialogPeer : public ::gnu::java::awt::peer::gtk::GtkWindowPeer
-{
-
-public:
-  GtkDialogPeer(::java::awt::Dialog *);
-public: // actually package-private
-  virtual void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h
deleted file mode 100644
index 6dea24e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
-#define __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkFramePeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkEmbeddedWindowPeer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkEmbeddedWindowPeer : public ::gnu::java::awt::peer::gtk::GtkFramePeer
-{
-
-public: // actually package-private
-  virtual void create(jlong);
-  virtual void create();
-  virtual void construct(jlong);
-public:
-  virtual void embed(jlong);
-  GtkEmbeddedWindowPeer(::gnu::java::awt::EmbeddedWindow *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h
deleted file mode 100644
index 7bf3529..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
-#define __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkDialogPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkContainerPeer;
-              class GtkFileDialogPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class FileDialog;
-      namespace event
-      {
-          class PaintEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkFileDialogPeer : public ::gnu::java::awt::peer::gtk::GtkDialogPeer
-{
-
-public: // actually package-private
-  virtual void create(::gnu::java::awt::peer::gtk::GtkContainerPeer *, jint);
-  virtual void connectSignals();
-  virtual void nativeSetFile(::java::lang::String *);
-public:
-  virtual ::java::lang::String * nativeGetDirectory();
-  virtual void nativeSetDirectory(::java::lang::String *);
-public: // actually package-private
-  virtual void nativeSetFilenameFilter(::java::io::FilenameFilter *);
-public:
-  virtual void create();
-  GtkFileDialogPeer(::java::awt::FileDialog *);
-public: // actually package-private
-  virtual void setComponentBounds();
-public:
-  virtual void setFile(::java::lang::String *);
-  virtual void setDirectory(::java::lang::String *);
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-public: // actually package-private
-  virtual jboolean filenameFilterCallback(::java::lang::String *);
-public: // actually protected
-  virtual void updateComponent(::java::awt::event::PaintEvent *);
-public: // actually package-private
-  virtual void gtkHideFileDialog();
-  virtual void gtkDisposeFileDialog();
-  virtual void gtkSetFilename(::java::lang::String *);
-  static ::java::lang::String * FS;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkDialogPeer)))) currentFile;
-  ::java::lang::String * currentDirectory;
-  ::java::io::FilenameFilter * filter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
deleted file mode 100644
index 2c8ea0e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkFramePeer__
-#define __gnu_java_awt_peer_gtk_GtkFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkFramePeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Image;
-        class MenuBar;
-        class Rectangle;
-      namespace peer
-      {
-          class MenuBarPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkFramePeer : public ::gnu::java::awt::peer::gtk::GtkWindowPeer
-{
-
-public: // actually package-private
-  virtual jint getMenuBarHeight(::java::awt::peer::MenuBarPeer *);
-  virtual void setMenuBarWidthUnlocked(::java::awt::peer::MenuBarPeer *, jint);
-  virtual void setMenuBarWidth(::java::awt::peer::MenuBarPeer *, jint);
-  virtual void setMenuBarPeer(::java::awt::peer::MenuBarPeer *);
-  virtual void removeMenuBarPeer();
-  virtual void gtkFixedSetVisible(jboolean);
-private:
-  void maximize();
-  void unmaximize();
-  void iconify();
-  void deiconify();
-public: // actually package-private
-  virtual jint getMenuBarHeight();
-public:
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void postInsetsChangedEvent(jint, jint, jint, jint);
-public:
-  GtkFramePeer(::java::awt::Frame *);
-public: // actually package-private
-  virtual void create();
-  virtual void nativeSetIconImage(::gnu::java::awt::peer::gtk::GtkImage *);
-public:
-  virtual void setIconImage(::java::awt::Image *);
-public: // actually protected
-  virtual void postConfigureEvent(jint, jint, jint, jint);
-public:
-  virtual jint getState();
-  virtual void setState(jint);
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual void setBoundsPrivate(jint, jint, jint, jint);
-  virtual jboolean requestWindowFocus();
-  virtual ::java::awt::Rectangle * getBoundsPrivate();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkWindowPeer)))) menuBarHeight;
-  ::java::awt::peer::MenuBarPeer * menuBar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkFramePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
deleted file mode 100644
index ffb135b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkGenericPeer__
-#define __gnu_java_awt_peer_gtk_GtkGenericPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class EventQueue;
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkGenericPeer : public ::java::lang::Object
-{
-
-  static void initIDs();
-public:
-  virtual void dispose();
-public: // actually package-private
-  static ::java::awt::EventQueue * q();
-public: // actually protected
-  GtkGenericPeer(::java::lang::Object *);
-  virtual void postActionEvent(::java::lang::String *, jint);
-public: // actually package-private
-  static jint getUniqueInteger();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::awt::Font *);
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  static void printCurrentThread();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) native_state;
-private:
-  static jint next_native_state;
-public: // actually protected
-  ::java::lang::Object * awtWidget;
-private:
-  ::gnu::classpath::Pointer * widget;
-  ::gnu::classpath::Pointer * globalRef;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkGenericPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImage.h b/libjava/gnu/java/awt/peer/gtk/GtkImage.h
deleted file mode 100644
index 4028d93..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkImage.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkImage__
-#define __gnu_java_awt_peer_gtk_GtkImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkImage : public ::java::awt::Image
-{
-
-  void initFromBuffer(jlong);
-public: // actually package-private
-  virtual JArray< jint > * getPixels();
-private:
-  void setPixels(JArray< jint > *);
-  jboolean loadPixbuf(::java::lang::String *);
-  jboolean loadImageFromData(JArray< jbyte > *);
-  void createPixbuf();
-  void freePixbuf();
-  void createScaledPixbuf(::gnu::java::awt::peer::gtk::GtkImage *, jint);
-public:
-  GtkImage(::java::awt::image::ImageProducer *);
-  GtkImage();
-  GtkImage(::java::lang::String *);
-  GtkImage(JArray< jbyte > *);
-  GtkImage(::java::net::URL *);
-private:
-  GtkImage(::gnu::java::awt::peer::gtk::GtkImage *, jint, jint, jint);
-public: // actually package-private
-  GtkImage(::gnu::classpath::Pointer *);
-  GtkImage(jint, jint, jlong);
-  static ::gnu::java::awt::peer::gtk::GtkImage * getErrorImage();
-private:
-  void createFromPixbuf();
-public:
-  virtual void setImage(jint, jint, JArray< jint > *, ::java::util::Hashtable *);
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual void finalize();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-private:
-  void deliver();
-  jboolean addObserver(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jboolean isLoaded;
-  ::gnu::classpath::Pointer * pixbuf;
-  ::java::util::Vector * observers;
-  jboolean errorLoading;
-  ::java::awt::image::ImageProducer * source;
-  static ::java::awt::image::ColorModel * nativeModel;
-private:
-  static ::gnu::java::awt::peer::gtk::GtkImage * errorImage;
-public: // actually package-private
-  static ::java::lang::Object * pixbufLock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h b/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h
deleted file mode 100644
index aeccd06..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkImageConsumer__
-#define __gnu_java_awt_peer_gtk_GtkImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkImage;
-              class GtkImageConsumer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkImageConsumer : public ::java::lang::Object
-{
-
-public:
-  GtkImageConsumer(::gnu::java::awt::peer::gtk::GtkImage *, ::java::awt::image::ImageProducer *);
-  virtual void imageComplete(jint);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setDimensions(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jint > * convertPixels(JArray< jbyte > *);
-public:
-  virtual void setProperties(::java::util::Hashtable *);
-private:
-  ::gnu::java::awt::peer::gtk::GtkImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  jint width;
-  jint height;
-  ::java::util::Hashtable * properties;
-  JArray< jint > * pixelCache;
-  ::java::awt::image::ImageProducer * source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkImageConsumer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h
deleted file mode 100644
index c80c6f4..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkLabelPeer__
-#define __gnu_java_awt_peer_gtk_GtkLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkLabelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkLabelPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(::java::lang::String *, jfloat);
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void nativeSetAlignment(jfloat);
-public:
-  virtual void setNativeText(::java::lang::String *);
-public: // actually package-private
-  virtual void setNativeBounds(jint, jint, jint, jint);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-  virtual void create();
-public:
-  virtual void setText(::java::lang::String *);
-  GtkLabelPeer(::java::awt::Label *);
-  virtual void setAlignment(jint);
-public: // actually package-private
-  virtual jfloat getGtkAlignment(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h
deleted file mode 100644
index 8d8a7a0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkListPeer__
-#define __gnu_java_awt_peer_gtk_GtkListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkListPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class List;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkListPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-  virtual void create(jint);
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkWidgetRequestFocus();
-  virtual void getSize(jint, jint, JArray< jint > *);
-public:
-  GtkListPeer(::java::awt::List *);
-public: // actually package-private
-  virtual void append(JArray< ::java::lang::String * > *);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void postItemEvent(jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkListPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h
deleted file mode 100644
index 159ec78..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMainThread__
-#define __gnu_java_awt_peer_gtk_GtkMainThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMainThread;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMainThread : public ::java::lang::Thread
-{
-
-  GtkMainThread();
-public:
-  virtual void run();
-private:
-  static void setRunning(jboolean);
-  static void startMainThread();
-  static void endMainThread();
-public:
-  static void createWindow();
-  static void destroyWindow();
-private:
-  static jint numberOfWindows;
-  static ::java::lang::Object * nWindowsLock;
-  static jboolean running;
-  static ::java::lang::Object * runningLock;
-public:
-  static ::gnu::java::awt::peer::gtk::GtkMainThread * mainThread;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMainThread__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h
deleted file mode 100644
index 916d6dd..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuBarPeer;
-              class GtkMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuBarPeer : public ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer
-{
-
-public: // actually protected
-  virtual void create();
-private:
-  void addMenu(::gnu::java::awt::peer::gtk::GtkMenuPeer *);
-public:
-  GtkMenuBarPeer(::java::awt::MenuBar *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  virtual void addMenu(::java::awt::Menu *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer)))) hasHelpMenu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h
deleted file mode 100644
index 500f5a9..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually protected
-  virtual void create() = 0;
-private:
-  void setFont();
-public:
-  GtkMenuComponentPeer(::java::awt::MenuComponent *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h
deleted file mode 100644
index e84841c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuItemPeer : public ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-  virtual void connectSignals();
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-  virtual void create();
-public:
-  GtkMenuItemPeer(::java::awt::MenuItem *);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-public: // actually protected
-  virtual void postMenuActionEvent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h
deleted file mode 100644
index 1d1f84a..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuItemPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-              class GtkMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuItem;
-        class MenuShortcut;
-      namespace peer
-      {
-          class MenuItemPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuPeer : public ::gnu::java::awt::peer::gtk::GtkMenuItemPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-private:
-  void addItem(::java::awt::peer::MenuItemPeer *, jint, jboolean);
-public: // actually package-private
-  virtual void setupAccelGroup(::gnu::java::awt::peer::gtk::GtkGenericPeer *);
-private:
-  void addTearOff();
-public: // actually protected
-  virtual void connectSignals();
-public:
-  GtkMenuPeer(::java::awt::Menu *);
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addItem(::java::awt::peer::MenuItemPeer *, ::java::awt::MenuShortcut *);
-  virtual void delItem(jint);
-  virtual void addSeparator();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h
deleted file mode 100644
index 8edc663..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
-#define __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsEnvironment;
-              class GtkMouseInfoPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMouseInfoPeer : public ::java::lang::Object
-{
-
-public:
-  GtkMouseInfoPeer();
-  virtual jint fillPointWithCoords(::java::awt::Point *);
-  virtual jboolean isWindowUnderMouse(::java::awt::Window *);
-private:
-  static ::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment * gde;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h
deleted file mode 100644
index b4349ee..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkPanelPeer__
-#define __gnu_java_awt_peer_gtk_GtkPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkPanelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Panel;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkPanelPeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void create();
-public:
-  GtkPanelPeer(::java::awt::Panel *);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void connectSignals();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h
deleted file mode 100644
index f62b014..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
-#define __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-              class GtkPopupMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class PopupMenu;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkPopupMenuPeer : public ::gnu::java::awt::peer::gtk::GtkMenuPeer
-{
-
-public:
-  GtkPopupMenuPeer(::java::awt::PopupMenu *);
-public: // actually package-private
-  virtual void setupAccelGroup(::gnu::java::awt::peer::gtk::GtkGenericPeer *);
-  virtual void show(jint, jint, jlong);
-public:
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual void show(::java::awt::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h
deleted file mode 100644
index 051fd83..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
-#define __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkScrollPanePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Dimension;
-        class ScrollPane;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkScrollPanePeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void create(jint, jint);
-  virtual void create();
-  virtual void gtkScrolledWindowSetHScrollIncrement(jint);
-  virtual void gtkScrolledWindowSetVScrollIncrement(jint);
-public:
-  GtkScrollPanePeer(::java::awt::ScrollPane *);
-public: // actually package-private
-  virtual void setPolicy(jint);
-public:
-  virtual void childResized(jint, jint);
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual void setScrollPosition(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint);
-  virtual void setValue(::java::awt::Adjustable *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h
deleted file mode 100644
index 3557d62..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
-#define __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkScrollbarPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkScrollbarPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-  virtual void create(jint, jint, jint, jint, jint, jint, jint);
-  virtual void connectSignals();
-public:
-  GtkScrollbarPeer(::java::awt::Scrollbar *);
-  virtual void setLineIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void setValues(jint, jint, jint, jint);
-private:
-  void setBarValues(jint, jint, jint, jint);
-public: // actually protected
-  virtual void postAdjustmentEvent(jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkSelection.h b/libjava/gnu/java/awt/peer/gtk/GtkSelection.h
deleted file mode 100644
index 5ed45d0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkSelection.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkSelection__
-#define __gnu_java_awt_peer_gtk_GtkSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkSelection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkSelection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GtkSelection(::gnu::java::awt::peer::gtk::GtkClipboard *);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-private:
-  void mimeTypesAvailable(JArray< ::java::lang::String * > *);
-public:
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-private:
-  ::java::lang::String * getText();
-  void textAvailable(::java::lang::String *);
-  ::java::awt::Image * getImage();
-  void imageAvailable(::gnu::classpath::Pointer *);
-  ::java::util::List * getURIs();
-  void urisAvailable(JArray< ::java::lang::String * > *);
-  JArray< jbyte > * getBytes(::java::lang::String *);
-  void bytesAvailable(JArray< jbyte > *);
-public:
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-private:
-  void requestText(jboolean);
-  void requestImage(jboolean);
-  void requestURIs(jboolean);
-  void requestBytes(jboolean, ::java::lang::String *);
-  void requestMimeTypes(jboolean);
-  static ::java::lang::Object * requestLock;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) clipboard;
-  jboolean requestInProgress;
-  jboolean mimeTypesDelivered;
-  JArray< ::java::awt::datatransfer::DataFlavor * > * dataFlavors;
-  jboolean textDelivered;
-  ::java::lang::String * text;
-  jboolean imageDelivered;
-  ::gnu::classpath::Pointer * imagePointer;
-  ::java::awt::Image * image;
-  jboolean urisDelivered;
-  ::java::util::List * uris;
-  jboolean bytesDelivered;
-  JArray< jbyte > * bytes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkSelection__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h
deleted file mode 100644
index 5d4b14e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
-#define __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkTextAreaPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkTextAreaPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(jint, jint, jint);
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkWidgetRequestFocus();
-public:
-  virtual void connectSignals();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-public: // actually package-private
-  virtual void create();
-public:
-  GtkTextAreaPeer(::java::awt::TextArea *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-public: // actually package-private
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-public:
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-private:
-  static jint DEFAULT_ROWS;
-  static jint DEFAULT_COLS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h
deleted file mode 100644
index ddcf366..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
-#define __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkTextFieldPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkTextFieldPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-public:
-  virtual void connectSignals();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-public: // actually package-private
-  virtual void create();
-  virtual jint gtkEntryGetBorderWidth();
-public:
-  GtkTextFieldPeer(::java::awt::TextField *);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual void setEchoChar(jchar);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void setEchoCharacter(jchar);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h
deleted file mode 100644
index c8d404b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
-#define __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkToolkit$LRUCache;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit$LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  GtkToolkit$LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) max_entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
deleted file mode 100644
index c562e05..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
+++ /dev/null
@@ -1,250 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit__
-#define __gnu_java_awt_peer_gtk_GtkToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkToolkit;
-              class GtkToolkit$LRUCache;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class Point;
-        class PopupMenu;
-        class PrintJob;
-        class Rectangle;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class MouseInfoPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public: // actually package-private
-  static void gtkInit(jint, ::java::lang::Object *);
-  static void gtkMain();
-  static void gtkQuit();
-private:
-  static void initIDs();
-public: // actually package-private
-  static void initializeGlobalIDs();
-public:
-  GtkToolkit();
-  virtual void beep();
-private:
-  void getScreenSizeDimensions(JArray< jint > *);
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually package-private
-  static ::java::awt::Image * imageOrError(::java::awt::Image *);
-public:
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-  virtual ::java::awt::image::ImageProducer * createImageProducer(::java::net::URL *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual jint getScreenResolution();
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemSelection();
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-public: // actually protected
-  virtual void setComponentState(::java::awt::Component *, ::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-public:
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-private:
-  ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint, jint);
-public:
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::awt::Cursor * createCustomCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-public: // actually protected
-  virtual void loadSystemColors(JArray< jint > *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual jboolean getLockingKeyState(jint);
-public: // actually protected
-  virtual jint getLockState(jint);
-public:
-  virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
-public: // actually protected
-  virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer();
-public:
-  virtual jboolean isFrameStateSupported(jint);
-private:
-  void checkHeadless();
-public:
-  virtual jint getMouseNumberOfButtons();
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-public: // actually package-private
-  static ::java::lang::Object * GTK_LOCK;
-private:
-  static ::java::awt::EventQueue * q;
-  static jboolean initializedGlobalIDs;
-  ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache;
-  ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * imageCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h b/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h
deleted file mode 100644
index 308bc8e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
-#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
-
-#pragma interface
-
-#include <java/awt/image/VolatileImage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkVolatileImage : public ::java::awt::image::VolatileImage
-{
-
-public: // actually package-private
-  virtual jlong init(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint);
-  virtual void destroy(jlong);
-  virtual JArray< jint > * nativeGetPixels(jlong);
-public:
-  virtual JArray< jint > * getPixels();
-public: // actually package-private
-  virtual void nativeCopyArea(jlong, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  virtual void nativeDrawVolatile(jlong, jlong, jint, jint, jint, jint);
-public:
-  virtual void drawVolatile(jlong, jint, jint, jint, jint);
-  GtkVolatileImage(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint, ::java::awt::ImageCapabilities *);
-  GtkVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  GtkVolatileImage(jint, jint);
-  virtual void finalize();
-  virtual void dispose();
-  virtual ::java::awt::image::BufferedImage * getSnapshot();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual jint validate(::java::awt::GraphicsConfiguration *);
-  virtual jboolean contentsLost();
-  virtual ::java::awt::ImageCapabilities * getCapabilities();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  static ::java::awt::image::SampleModel * createGdkSampleModel(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::VolatileImage)))) width;
-  jint height;
-private:
-  ::java::awt::ImageCapabilities * caps;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * component;
-  static ::java::awt::image::ColorModel * gdkColorModel;
-  jlong nativePointer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkVolatileImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
deleted file mode 100644
index a40f416..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkWindowPeer__
-#define __gnu_java_awt_peer_gtk_GtkWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dialog;
-        class Graphics;
-        class Point;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkWindowPeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void gtkWindowSetTitle(::java::lang::String *);
-  virtual void gtkWindowSetResizable(jboolean);
-  virtual void gtkWindowSetModal(jboolean);
-  virtual void gtkWindowSetAlwaysOnTop(jboolean);
-  virtual jboolean gtkWindowHasFocus();
-  virtual void realize();
-public:
-  virtual void dispose();
-public: // actually package-private
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual void create(jint, jboolean, ::gnu::java::awt::peer::gtk::GtkWindowPeer *);
-  virtual void create(jint, jboolean);
-  virtual void create();
-  virtual void setParent();
-  virtual void setVisibleAndEnabled();
-public:
-  virtual void setVisibleNative(jboolean);
-  virtual void setVisibleNativeUnlocked(jboolean);
-public: // actually package-private
-  virtual void connectSignals();
-public:
-  GtkWindowPeer(::java::awt::Window *);
-  virtual void toBack();
-  virtual void toFront();
-public: // actually package-private
-  virtual void nativeSetBounds(jint, jint, jint, jint);
-  virtual void nativeSetBoundsUnlocked(jint, jint, jint, jint);
-  virtual void nativeSetLocation(jint, jint);
-  virtual void nativeSetLocationUnlocked(jint, jint);
-public: // actually protected
-  virtual void setLocation(jint, jint);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setTitle(::java::lang::String *);
-public: // actually protected
-  virtual void setSize(jint, jint);
-public:
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void postInsetsChangedEvent(jint, jint, jint, jint);
-  virtual void postConfigureEvent(jint, jint, jint, jint);
-public:
-  virtual void show();
-public: // actually package-private
-  virtual void postWindowEvent(jint, ::java::awt::Window *, jint);
-public:
-  virtual void updateAlwaysOnTop();
-public: // actually protected
-  virtual void postExposeEvent(jint, jint, jint, jint);
-public:
-  virtual jboolean requestWindowFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual ::java::awt::Graphics * getGraphics();
-public: // actually protected
-  virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-public: // actually protected
-  static const jint GDK_WINDOW_TYPE_HINT_NORMAL = 0;
-  static const jint GDK_WINDOW_TYPE_HINT_DIALOG = 1;
-  static const jint GDK_WINDOW_TYPE_HINT_MENU = 2;
-  static const jint GDK_WINDOW_TYPE_HINT_TOOLBAR = 3;
-  static const jint GDK_WINDOW_TYPE_HINT_SPLASHSCREEN = 4;
-  static const jint GDK_WINDOW_TYPE_HINT_UTILITY = 5;
-  static const jint GDK_WINDOW_TYPE_HINT_DOCK = 6;
-  static const jint GDK_WINDOW_TYPE_HINT_DESKTOP = 7;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkContainerPeer)))) windowState;
-private:
-  jint x;
-  jint y;
-  jint width;
-  jint height;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h
deleted file mode 100644
index b7f0121..0000000
--- a/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_VolatileImageGraphics__
-#define __gnu_java_awt_peer_gtk_VolatileImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/ComponentGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkVolatileImage;
-              class VolatileImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::VolatileImageGraphics : public ::gnu::java::awt::peer::gtk::ComponentGraphics
-{
-
-public:
-  VolatileImageGraphics(::gnu::java::awt::peer::gtk::GtkVolatileImage *);
-private:
-  VolatileImageGraphics(::gnu::java::awt::peer::gtk::VolatileImageGraphics *);
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::Graphics * create();
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-private:
-  ::gnu::java::awt::peer::gtk::GtkVolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::ComponentGraphics)))) owner;
-  ::java::awt::image::BufferedImage * buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_VolatileImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h
deleted file mode 100644
index fc1b98d..0000000
--- a/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
-#define __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace headless
-          {
-              class HeadlessGraphicsEnvironment;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::headless::HeadlessGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  HeadlessGraphicsEnvironment();
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h b/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h
deleted file mode 100644
index 657b323..0000000
--- a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h
+++ /dev/null
@@ -1,192 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_headless_HeadlessToolkit__
-#define __gnu_java_awt_peer_headless_HeadlessToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace headless
-          {
-              class HeadlessGraphicsEnvironment;
-              class HeadlessToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::headless::HeadlessToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public:
-  HeadlessToolkit();
-  virtual void beep();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually protected
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-public:
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual jint getScreenResolution();
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-private:
-  ::gnu::java::awt::peer::headless::HeadlessGraphicsEnvironment * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) graphicsEnv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_headless_HeadlessToolkit__
diff --git a/libjava/gnu/java/awt/peer/qt/MainQtThread.h b/libjava/gnu/java/awt/peer/qt/MainQtThread.h
deleted file mode 100644
index 9d3b746..0000000
--- a/libjava/gnu/java/awt/peer/qt/MainQtThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_MainQtThread__
-#define __gnu_java_awt_peer_qt_MainQtThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class MainQtThread;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::MainQtThread : public ::java::lang::Thread
-{
-
-public:
-  MainQtThread(::java::lang::String *, jboolean);
-  virtual jboolean isRunning();
-  virtual jlong init(::java::lang::String *, jboolean);
-  virtual void exec(jlong);
-  virtual void run();
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Thread)))) QApplicationPointer;
-  jlong mainThreadInterface;
-  ::java::lang::String * theme;
-private:
-  jboolean running;
-  jboolean doublebuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_MainQtThread__
diff --git a/libjava/gnu/java/awt/peer/qt/NativeWrapper.h b/libjava/gnu/java/awt/peer/qt/NativeWrapper.h
deleted file mode 100644
index 0bf62e0..0000000
--- a/libjava/gnu/java/awt/peer/qt/NativeWrapper.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_NativeWrapper__
-#define __gnu_java_awt_peer_qt_NativeWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class NativeWrapper;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::NativeWrapper : public ::java::lang::Object
-{
-
-public:
-  NativeWrapper();
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) nativeObject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_NativeWrapper__
diff --git a/libjava/gnu/java/awt/peer/qt/QMatrix.h b/libjava/gnu/java/awt/peer/qt/QMatrix.h
deleted file mode 100644
index 7ff6bfb..0000000
--- a/libjava/gnu/java/awt/peer/qt/QMatrix.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QMatrix__
-#define __gnu_java_awt_peer_qt_QMatrix__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QMatrix : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QMatrix(::java::awt::geom::AffineTransform *);
-private:
-  void init(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  JArray< jdouble > * getMatrix();
-public:
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QMatrix__
diff --git a/libjava/gnu/java/awt/peer/qt/QPainterPath.h b/libjava/gnu/java/awt/peer/qt/QPainterPath.h
deleted file mode 100644
index ffc104e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QPainterPath.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QPainterPath__
-#define __gnu_java_awt_peer_qt_QPainterPath__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QPainterPath;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class GeneralPath;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QPainterPath : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public: // actually package-private
-  QPainterPath();
-public:
-  QPainterPath(::java::awt::Shape *);
-  QPainterPath(jdouble, jdouble, jdouble, jdouble);
-  QPainterPath(jdouble, jdouble, jdouble, jdouble, jboolean);
-  virtual ::java::awt::geom::GeneralPath * getPath();
-private:
-  void init(jint);
-  void moveTo(jdouble, jdouble);
-  void close();
-  void lineTo(jdouble, jdouble);
-  void quadTo(jdouble, jdouble, jdouble, jdouble);
-  void cubicTo(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QPainterPath__
diff --git a/libjava/gnu/java/awt/peer/qt/QPen.h b/libjava/gnu/java/awt/peer/qt/QPen.h
deleted file mode 100644
index 973e24c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QPen.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QPen__
-#define __gnu_java_awt_peer_qt_QPen__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QPen;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Stroke;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QPen : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QPen(::java::awt::Stroke *);
-private:
-  void init(jdouble, jint, jint, jdouble);
-public:
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QPen__
diff --git a/libjava/gnu/java/awt/peer/qt/QtAudioClip.h b/libjava/gnu/java/awt/peer/qt/QtAudioClip.h
deleted file mode 100644
index 4e74b63..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtAudioClip.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtAudioClip__
-#define __gnu_java_awt_peer_qt_QtAudioClip__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtAudioClip;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtAudioClip : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QtAudioClip(::java::lang::String *);
-  QtAudioClip(::java::net::URL *);
-private:
-  void loadClip(::java::lang::String *);
-  void play(jboolean);
-  jboolean isAvailable();
-  void checkForQt();
-public:
-  virtual void loop();
-  virtual void play();
-  virtual void stop();
-  virtual void dispose();
-  virtual void finalize();
-private:
-  static ::java::awt::Toolkit * t;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtAudioClip__
diff --git a/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h b/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h
deleted file mode 100644
index 5476a04..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtButtonPeer__
-#define __gnu_java_awt_peer_qt_QtButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtButtonPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtButtonPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtButtonPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Button *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-public: // actually package-private
-  virtual void fireClick(jint);
-public:
-  virtual void setLabel(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h b/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h
deleted file mode 100644
index 1d8be8c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtCanvasPeer__
-#define __gnu_java_awt_peer_qt_QtCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtCanvasPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Dimension;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtCanvasPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtCanvasPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Canvas *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h b/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h
deleted file mode 100644
index f90ce36..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtCheckboxPeer__
-#define __gnu_java_awt_peer_qt_QtCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtCheckboxPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtCheckboxPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtCheckboxPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Checkbox *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void fireToggle(jboolean);
-public:
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-private:
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtComponentPeer)))) group;
-  static ::java::util::WeakHashMap * groupMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h b/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h
deleted file mode 100644
index 46a12c2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtChoicePeer__
-#define __gnu_java_awt_peer_qt_QtChoicePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtChoicePeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Choice;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtChoicePeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtChoicePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Choice *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void fireChoice(jint);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtChoicePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h b/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h
deleted file mode 100644
index 733247a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentGraphics__
-#define __gnu_java_awt_peer_qt_QtComponentGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentGraphics;
-              class QtComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentGraphics : public ::gnu::java::awt::peer::qt::QtGraphics
-{
-
-public:
-  QtComponentGraphics(jlong, ::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public: // actually package-private
-  QtComponentGraphics(::gnu::java::awt::peer::qt::QtComponentGraphics *);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-private:
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtGraphics)))) peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h
deleted file mode 100644
index 90f9629..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
-#define __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtComponentPeer$RepaintTimerTask;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentPeer$RepaintTimerTask : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  QtComponentPeer$RepaintTimerTask(::gnu::java::awt::peer::qt::QtComponentPeer *, ::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public:
-  virtual void run();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) x;
-  jint y;
-  jint w;
-  jint h;
-  ::gnu::java::awt::peer::qt::QtComponentPeer * peer;
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtComponentPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
deleted file mode 100644
index 4688b8e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentPeer__
-#define __gnu_java_awt_peer_qt_QtComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtContainerPeer;
-              class QtFontPeer;
-              class QtImage;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  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;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public: // actually package-private
-  QtComponentPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void callInit();
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void QtUpdate();
-  virtual void QtUpdateArea(jint, jint, jint, jint);
-private:
-  void disposeNative();
-  void setGround(jint, jint, jint, jboolean);
-  void setBoundsNative(jint, jint, jint, jint);
-  void setCursor(jint);
-  ::java::awt::Color * getNativeBackground();
-  void setFontNative(::gnu::java::awt::peer::qt::QtFontPeer *);
-  jint whichScreen();
-  void reparentNative(::gnu::java::awt::peer::qt::QtContainerPeer *);
-  void getLocationOnScreenNative(::java::awt::Point *);
-  jboolean drawableComponent();
-public: // actually package-private
-  virtual void updateBounds();
-  virtual void updateBackBuffer(jint, jint);
-public: // actually protected
-  virtual void closeEvent();
-  virtual void enterEvent(jint, jint, jint, jint);
-  virtual void focusInEvent();
-  virtual void focusOutEvent();
-  virtual void keyPressEvent(jint, jint, jint, jint);
-  virtual void keyReleaseEvent(jint, jint, jint, jint);
-  virtual void leaveEvent(jint, jint, jint, jint);
-  virtual void mouseDoubleClickEvent(jint, jint, jint, jint);
-  virtual void mouseMoveEvent(jint, jint, jint, jint);
-  virtual void mousePressEvent(jint, jint, jint, jint);
-  virtual void mouseReleaseEvent(jint, jint, jint, jint);
-  virtual void moveEvent(jint, jint, jint, jint);
-  virtual void resizeEvent(jint, jint, jint, jint);
-  virtual void showEvent();
-  virtual void hideEvent();
-public:
-  virtual void setEventMask(jlong);
-  virtual jboolean canDetermineObscurity();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void destroyBuffers();
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual void finalize();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::awt::Point * getLocationOnScreen();
-private:
-  void getSizeNative(::java::awt::Dimension *, jboolean);
-  ::java::awt::Dimension * getSize(jboolean);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual jboolean handlesWheelScrolling();
-  virtual void hide();
-  virtual jboolean isFocusable();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isObscured();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void paint(::java::awt::Graphics *);
-  virtual void paintBackBuffer();
-  virtual void paintBackBuffer(jint, jint, jint, jint);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void updateCursorImmediately();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually protected
-  static const jint POPUP_TRIGGER = 3;
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit;
-public: // actually package-private
-  ::java::awt::Component * owner;
-private:
-  jlong eventMask;
-  jboolean hasMotionListeners;
-public: // actually protected
-  ::gnu::java::awt::peer::qt::QtImage * backBuffer;
-  jlong qtApp;
-private:
-  jboolean settingUp;
-  jboolean ignoreResize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h b/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h
deleted file mode 100644
index f9e60b3..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtContainerPeer__
-#define __gnu_java_awt_peer_qt_QtContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtContainerPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtContainerPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtContainerPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void beginLayout();
-  virtual void beginValidate();
-  virtual void endLayout();
-  virtual void endValidate();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual jboolean isPaintPending();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h b/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h
deleted file mode 100644
index 483aa8e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtDialogPeer__
-#define __gnu_java_awt_peer_qt_QtDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtDialogPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtDialogPeer : public ::gnu::java::awt::peer::qt::QtWindowPeer
-{
-
-public:
-  QtDialogPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Dialog *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void setModal(jboolean);
-private:
-  void setBoundsNative(jint, jint, jint, jint, jboolean);
-public:
-  virtual void setResizable(jboolean);
-  virtual void setBounds(jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h
deleted file mode 100644
index 5ee942d..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
-#define __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtFramePeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtEmbeddedWindowPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtEmbeddedWindowPeer : public ::gnu::java::awt::peer::qt::QtFramePeer
-{
-
-public:
-  QtEmbeddedWindowPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void embed(jlong);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h b/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h
deleted file mode 100644
index a87e72f..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFileDialogPeer__
-#define __gnu_java_awt_peer_qt_QtFileDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtDialogPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFileDialogPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class FileDialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFileDialogPeer : public ::gnu::java::awt::peer::qt::QtDialogPeer
-{
-
-public:
-  QtFileDialogPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::FileDialog *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setMode(jint);
-  void fileDialogDone(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void setFile(::java::lang::String *);
-  virtual void setDirectory(::java::lang::String *);
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFileDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
deleted file mode 100644
index fcb30d2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFontMetrics__
-#define __gnu_java_awt_peer_qt_QtFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFontMetrics;
-              class QtFontPeer;
-              class QtGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFontMetrics : public ::java::awt::FontMetrics
-{
-
-public:
-  QtFontMetrics(::java::awt::Font *);
-  QtFontMetrics(::java::awt::Font *, ::java::awt::Graphics *);
-public: // actually package-private
-  QtFontMetrics(::gnu::java::awt::peer::qt::QtFontPeer *, ::java::awt::Graphics *);
-public:
-  QtFontMetrics(::gnu::java::awt::peer::qt::QtFontPeer *);
-private:
-  void init(::gnu::java::awt::peer::qt::QtFontPeer *);
-  void initGraphics(::gnu::java::awt::peer::qt::QtFontPeer *, ::gnu::java::awt::peer::qt::QtGraphics *);
-  void dispose();
-public: // actually package-private
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *);
-  virtual jboolean canDisplay(jint);
-public:
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint getLeading();
-  virtual jint getMaxAdvance();
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::Graphics *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) nativeObject;
-  ::gnu::java::awt::peer::qt::QtFontPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFontMetrics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
deleted file mode 100644
index 0daebcc..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFontPeer__
-#define __gnu_java_awt_peer_qt_QtFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFontMetrics;
-              class QtFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public:
-  QtFontPeer(::java::lang::String *, jint);
-  QtFontPeer(::java::lang::String *, jint, jint);
-  QtFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual void init();
-private:
-  void create(::java::lang::String *, jint, jint);
-public:
-  virtual void dispose();
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) nativeObject;
-  ::gnu::java::awt::peer::qt::QtFontMetrics * metrics;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFontPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
deleted file mode 100644
index a89557c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFramePeer__
-#define __gnu_java_awt_peer_qt_QtFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFramePeer;
-              class QtImage;
-              class QtMenuBarPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFramePeer : public ::gnu::java::awt::peer::qt::QtWindowPeer
-{
-
-public:
-  QtFramePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setIcon(::gnu::java::awt::peer::qt::QtImage *);
-  void setMaximizedBounds(jint, jint);
-  void setMenu(::gnu::java::awt::peer::qt::QtMenuBarPeer *);
-  jint menuBarHeight();
-public:
-  virtual void destroy();
-  virtual jint getState();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void setIconImage(::java::awt::Image *);
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual void setResizable(jboolean);
-  virtual void setState(jint);
-  virtual void setBoundsPrivate(jint, jint, jint, jint);
-  virtual void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-  virtual ::java::awt::Rectangle * getBoundsPrivate();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtWindowPeer)))) theState;
-public: // actually package-private
-  jlong frameObject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFramePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtGraphics.h b/libjava/gnu/java/awt/peer/qt/QtGraphics.h
deleted file mode 100644
index 710248b..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtGraphics.h
+++ /dev/null
@@ -1,215 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtGraphics__
-#define __gnu_java_awt_peer_qt_QtGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QPainterPath;
-              class QPen;
-              class QtFontPeer;
-              class QtGraphics;
-              class QtImage;
-              class QtVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtGraphics : public ::java::awt::Graphics2D
-{
-
-public: // actually package-private
-  QtGraphics();
-  QtGraphics(::gnu::java::awt::peer::qt::QtGraphics *);
-public: // actually protected
-  virtual void setup();
-public:
-  virtual void delete$();
-  virtual void dispose();
-private:
-  void resetClip();
-public: // actually protected
-  virtual void initImage(::gnu::java::awt::peer::qt::QtImage *);
-  virtual void initVolatileImage(::gnu::java::awt::peer::qt::QtVolatileImage *);
-private:
-  void cloneNativeContext(::gnu::java::awt::peer::qt::QtGraphics *);
-  void setColor(jint, jint, jint, jint);
-  void drawNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void fillNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void setClipNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void setClipRectNative(jint, jint, jint, jint);
-  void intersectClipNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void intersectClipRectNative(jint, jint, jint, jint);
-  void setQtTransform(::gnu::java::awt::peer::qt::QMatrix *);
-  void setNativeStroke(::gnu::java::awt::peer::qt::QPen *);
-  void setNativeComposite(jint);
-  void drawStringNative(::java::lang::String *, jdouble, jdouble);
-  void setLinearGradient(jint, jint, jint, jint, jint, jint, jdouble, jdouble, jdouble, jdouble, jboolean);
-  void setAlphaNative(jdouble);
-  void setFontNative(::gnu::java::awt::peer::qt::QtFontPeer *);
-  ::gnu::java::awt::peer::qt::QPainterPath * getClipNative();
-public: // actually package-private
-  virtual void setAlpha(jdouble);
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual void copyArea(jint, jint, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-  virtual ::java::awt::Color * getColor();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void clip(::java::awt::Shape *);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void setClip(::java::awt::Shape *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void translate(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void setStroke(::java::awt::Stroke *);
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void setComposite(::java::awt::Composite *);
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setPaint(::java::awt::Paint *);
-  virtual ::java::awt::Paint * getPaint();
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-private:
-  void updateRenderingHints();
-public:
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativeObject;
-private:
-  static ::java::awt::geom::AffineTransform * identity;
-public: // actually protected
-  ::java::awt::Font * font;
-  ::java::awt::Color * color;
-  ::java::awt::Color * bgcolor;
-  ::java::awt::Shape * clip__;
-  ::java::awt::Shape * initialClip;
-  ::java::awt::geom::AffineTransform * xform;
-  ::java::awt::Stroke * currentStroke;
-  jboolean nativeStroking;
-  ::java::awt::Composite * composite;
-  jdouble currentAlpha;
-  ::java::awt::Paint * currentPaint;
-  ::java::awt::RenderingHints * renderingHints;
-public: // actually package-private
-  ::java::awt::Graphics * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h
deleted file mode 100644
index ec1e0c8..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
-#define __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtGraphicsEnvironment;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  QtGraphicsEnvironment(::gnu::java::awt::peer::qt::QtToolkit *);
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-  virtual ::gnu::java::awt::peer::qt::QtToolkit * getToolkit();
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) toolkit;
-  JArray< ::java::awt::GraphicsDevice * > * screens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImage.h b/libjava/gnu/java/awt/peer/qt/QtImage.h
deleted file mode 100644
index 4c921b2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImage.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImage__
-#define __gnu_java_awt_peer_qt_QtImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QtComponentPeer;
-              class QtGraphics;
-              class QtImage;
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImage : public ::java::awt::Image
-{
-
-public:
-  virtual void clear();
-private:
-  JArray< jint > * getPixels();
-  void setPixels(JArray< jint > *);
-  jboolean loadImage(::java::lang::String *);
-  jboolean loadImageFromData(JArray< jbyte > *);
-  void createImage();
-  void freeImage();
-  void createScaledImage(::gnu::java::awt::peer::qt::QtImage *, jint);
-public: // actually package-private
-  virtual void drawPixels(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jboolean);
-private:
-  void drawPixelsScaled(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsTransformed(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *);
-public: // actually package-private
-  virtual void drawPixelsScaledFlipped(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-public:
-  QtImage(::java::awt::image::ImageProducer *);
-  QtImage(::java::net::URL *);
-  QtImage(::java::lang::String *);
-  QtImage(JArray< jbyte > *);
-  QtImage(jint, jint);
-private:
-  QtImage(::gnu::java::awt::peer::qt::QtImage *, jint, jint, jint);
-public:
-  virtual void setImage(jint, jint, JArray< jint > *, ::java::util::Hashtable *);
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-public: // actually package-private
-  virtual void putPainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-  virtual void removePainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual ::java::awt::Graphics * getGraphics();
-public: // actually package-private
-  virtual ::java::awt::Graphics * getDirectGraphics(::gnu::java::awt::peer::qt::QtComponentPeer *);
-public:
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual void finalize();
-  virtual void dispose();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-private:
-  void deliver();
-  jboolean addObserver(::java::awt::image::ImageObserver *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jboolean isLoaded;
-  jlong nativeObject;
-  ::java::util::Vector * observers;
-  jboolean errorLoading;
-  ::java::awt::image::ImageProducer * source;
-  static ::java::awt::image::ColorModel * nativeModel;
-  ::java::util::WeakHashMap * painters;
-  jboolean killFlag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImage__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h b/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h
deleted file mode 100644
index 8c929d4..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageConsumer__
-#define __gnu_java_awt_peer_qt_QtImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtImage;
-              class QtImageConsumer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageConsumer : public ::java::lang::Object
-{
-
-public:
-  QtImageConsumer(::gnu::java::awt::peer::qt::QtImage *, ::java::awt::image::ImageProducer *);
-  virtual void imageComplete(jint);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setDimensions(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jint > * convertPixels(JArray< jbyte > *);
-public:
-  virtual void setProperties(::java::util::Hashtable *);
-private:
-  ::gnu::java::awt::peer::qt::QtImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  jint width;
-  jint height;
-  ::java::util::Hashtable * properties;
-  JArray< jint > * pixelCache;
-  ::java::awt::image::ImageProducer * source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageConsumer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h b/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h
deleted file mode 100644
index d74e324..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageDirectGraphics__
-#define __gnu_java_awt_peer_qt_QtImageDirectGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtImageGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtImage;
-              class QtImageDirectGraphics;
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Image;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageDirectGraphics : public ::gnu::java::awt::peer::qt::QtImageGraphics
-{
-
-public:
-  QtImageDirectGraphics(::gnu::java::awt::peer::qt::QtImage *, ::gnu::java::awt::peer::qt::QtComponentPeer *);
-  QtImageDirectGraphics(::gnu::java::awt::peer::qt::QtImageGraphics *);
-private:
-  void scheduleUpdate();
-public:
-  virtual void dispose();
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-private:
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtImageGraphics)))) peer;
-  jboolean modified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageDirectGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h b/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h
deleted file mode 100644
index e5adb79..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageGraphics__
-#define __gnu_java_awt_peer_qt_QtImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageGraphics : public ::gnu::java::awt::peer::qt::QtGraphics
-{
-
-public:
-  QtImageGraphics(::java::awt::Image *);
-public: // actually package-private
-  QtImageGraphics(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual void dispose();
-  virtual ::java::awt::Graphics * create();
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtGraphics)))) parentImage;
-  ::java::util::Stack * owners;
-  ::gnu::java::awt::peer::qt::QtImageGraphics * topParent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h b/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h
deleted file mode 100644
index af81168..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtLabelPeer__
-#define __gnu_java_awt_peer_qt_QtLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtLabelPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtLabelPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtLabelPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Label *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void setAlignment(jint);
-  virtual void setText(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtListPeer.h b/libjava/gnu/java/awt/peer/qt/QtListPeer.h
deleted file mode 100644
index 0d4fbee..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtListPeer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtListPeer__
-#define __gnu_java_awt_peer_qt_QtListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtListPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class List;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtListPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtListPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::List *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-private:
-  void fireChoice(jint);
-  void itemDoubleClicked(jint, jint);
-  void select(jint, jboolean);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtComponentPeer)))) ignoreNextSelect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtListPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h
deleted file mode 100644
index 57e6d54..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuBarPeer__
-#define __gnu_java_awt_peer_qt_QtMenuBarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuBarPeer;
-              class QtMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuBarPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuBarPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuBar *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void addMenus();
-private:
-  void addMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void addHelpMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void delMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-public:
-  virtual void addMenu(::java::awt::Menu *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h
deleted file mode 100644
index 3cab645..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuComponentPeer__
-#define __gnu_java_awt_peer_qt_QtMenuComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuComponentPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QtMenuComponentPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuComponent *);
-public: // actually protected
-  virtual void callInit();
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void finalize();
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-public: // actually protected
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit;
-  ::java::awt::MenuComponent * owner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h
deleted file mode 100644
index 10eee1a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuItemPeer__
-#define __gnu_java_awt_peer_qt_QtMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuItemPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuItemPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuItemPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuItem *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void create(::java::lang::String *, jboolean, jboolean);
-public:
-  virtual void finalize();
-  virtual void dispose();
-private:
-  void fireClick(jint);
-public:
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h
deleted file mode 100644
index 79341a4..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuPeer__
-#define __gnu_java_awt_peer_qt_QtMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuItemPeer;
-              class QtMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Menu *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void addItems();
-private:
-  void fireClick();
-  void allowTearOff();
-  void insertSeperator();
-  void insertItem(::gnu::java::awt::peer::qt::QtMenuItemPeer *);
-  void insertMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void delItem(jlong);
-  void add(jlong);
-public:
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addSeparator();
-  virtual void delItem(jint);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtMenuComponentPeer)))) items;
-  jboolean itemsAdded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h b/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h
deleted file mode 100644
index c0031ef..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtPanelPeer__
-#define __gnu_java_awt_peer_qt_QtPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtPanelPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtPanelPeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtPanelPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h b/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h
deleted file mode 100644
index 3b78bc9..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtPopupMenuPeer__
-#define __gnu_java_awt_peer_qt_QtPopupMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtPopupMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class PopupMenu;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtPopupMenuPeer : public ::gnu::java::awt::peer::qt::QtMenuPeer
-{
-
-public:
-  QtPopupMenuPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::PopupMenu *);
-private:
-  void showNative(jint, jint);
-public:
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual void show(::java::awt::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtPopupMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h b/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h
deleted file mode 100644
index 9cc516c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
-#define __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtRepaintThread$RepaintComponent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent : public ::java::lang::Object
-{
-
-public:
-  QtRepaintThread$RepaintComponent(::gnu::java::awt::peer::qt::QtComponentPeer *);
-  QtRepaintThread$RepaintComponent(::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) curr;
-  ::gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent * next;
-  jboolean paintAll;
-  jint x;
-  jint y;
-  jint w;
-  jint h;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
diff --git a/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h b/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h
deleted file mode 100644
index e9d714c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtRepaintThread__
-#define __gnu_java_awt_peer_qt_QtRepaintThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtRepaintThread;
-              class QtRepaintThread$RepaintComponent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtRepaintThread : public ::java::lang::Thread
-{
-
-public:
-  QtRepaintThread();
-  virtual void run();
-  virtual void queueComponent(::gnu::java::awt::peer::qt::QtComponentPeer *);
-  virtual void queueComponent(::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) component;
-  jboolean busy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtRepaintThread__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h b/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h
deleted file mode 100644
index 179fa09..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScreenDevice__
-#define __gnu_java_awt_peer_qt_QtScreenDevice__
-
-#pragma interface
-
-#include <java/awt/GraphicsDevice.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScreenDevice;
-              class QtScreenDeviceConfiguration;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScreenDevice : public ::java::awt::GraphicsDevice
-{
-
-public:
-  QtScreenDevice(jint);
-  virtual void init(jint);
-  virtual void dispose();
-public: // actually package-private
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual jint getDpiX();
-  virtual jint getDpiY();
-  virtual jint depth();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(::java::awt::GraphicsConfigTemplate *);
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations();
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration();
-  virtual ::java::lang::String * getIDstring();
-  virtual jint getType();
-  virtual jboolean isDisplayChangeSupported();
-  virtual jboolean isFullScreenSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-  virtual void setFullScreenWindow(::java::awt::Window *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::GraphicsDevice)))) nativeObject;
-  jint id;
-  ::java::lang::String * IDstring;
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtScreenDeviceConfiguration * config;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScreenDevice__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h b/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h
deleted file mode 100644
index f9ec9e0..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
-#define __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
-
-#pragma interface
-
-#include <java/awt/GraphicsConfiguration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScreenDevice;
-              class QtScreenDeviceConfiguration;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScreenDeviceConfiguration : public ::java::awt::GraphicsConfiguration
-{
-
-public:
-  QtScreenDeviceConfiguration(::gnu::java::awt::peer::qt::QtScreenDevice *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::ColorModel * getColorModel(jint);
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform();
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform();
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint);
-private:
-  ::gnu::java::awt::peer::qt::QtScreenDevice * __attribute__((aligned(__alignof__( ::java::awt::GraphicsConfiguration)))) owner;
-  ::java::awt::Rectangle * bounds;
-  jdouble dpiX;
-  jdouble dpiY;
-  jint depth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h b/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h
deleted file mode 100644
index 23877b3..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScrollPanePeer__
-#define __gnu_java_awt_peer_qt_QtScrollPanePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScrollPanePeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Insets;
-        class ScrollPane;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScrollPanePeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtScrollPanePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::ScrollPane *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setPolicy(jint);
-public:
-  virtual void childResized(jint, jint);
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual void setScrollPosition(jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint);
-  virtual void setValue(::java::awt::Adjustable *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScrollPanePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h b/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h
deleted file mode 100644
index 3e13597..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScrollbarPeer__
-#define __gnu_java_awt_peer_qt_QtScrollbarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScrollbarPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScrollbarPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtScrollbarPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Scrollbar *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-private:
-  void setOrientation(jint);
-  void fireMoved(jint, jint);
-public:
-  virtual void setLineIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void setValues(jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScrollbarPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h b/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h
deleted file mode 100644
index 42ee905..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtTextAreaPeer__
-#define __gnu_java_awt_peer_qt_QtTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtTextAreaPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtTextAreaPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtTextAreaPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::TextArea *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  jint getSelection(jboolean);
-  void textChanged();
-public:
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual void setText(::java::lang::String *);
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setCaretPosition(jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h b/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h
deleted file mode 100644
index 123d95b..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtTextFieldPeer__
-#define __gnu_java_awt_peer_qt_QtTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtTextFieldPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtTextFieldPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtTextFieldPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::TextField *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void textChanged();
-  jint getSelection(jboolean);
-  ::java::awt::Dimension * getMinimumSizeNative(jint);
-  ::java::awt::Dimension * getPreferredSizeNative(jint);
-public:
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void select(jint, jint);
-  virtual void setCaretPosition(jint);
-  virtual void setEchoCharacter(jchar);
-  virtual void setEchoChar(jchar);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtToolkit.h b/libjava/gnu/java/awt/peer/qt/QtToolkit.h
deleted file mode 100644
index 319318a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtToolkit.h
+++ /dev/null
@@ -1,207 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtToolkit__
-#define __gnu_java_awt_peer_qt_QtToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace qt
-          {
-              class MainQtThread;
-              class QtGraphicsEnvironment;
-              class QtRepaintThread;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace event
-      {
-          class AWTEventListener;
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-  static void initToolkit();
-public:
-  QtToolkit();
-public: // actually package-private
-  virtual JArray< ::java::lang::String * > * nativeFontFamilies();
-  virtual jint numScreens();
-  virtual jint defaultScreen();
-public:
-  virtual void beep();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually protected
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-public:
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-public: // actually protected
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-public:
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners();
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners(jlong);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual jint getScreenResolution();
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-  static ::java::awt::EventQueue * eventQueue;
-  static ::gnu::java::awt::peer::qt::QtRepaintThread * repaintThread;
-  static ::gnu::java::awt::peer::qt::MainQtThread * guiThread;
-  static ::gnu::java::awt::peer::qt::QtGraphicsEnvironment * graphicsEnv;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtToolkit__
diff --git a/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h b/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h
deleted file mode 100644
index a3ceb29..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtVolatileImage$1__
-#define __gnu_java_awt_peer_qt_QtVolatileImage$1__
-
-#pragma interface
-
-#include <java/awt/ImageCapabilities.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtVolatileImage;
-              class QtVolatileImage$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtVolatileImage$1 : public ::java::awt::ImageCapabilities
-{
-
-public: // actually package-private
-  QtVolatileImage$1(::gnu::java::awt::peer::qt::QtVolatileImage *, jboolean);
-public:
-  virtual jboolean isTrueVolatile();
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtVolatileImage * __attribute__((aligned(__alignof__( ::java::awt::ImageCapabilities)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtVolatileImage$1__
diff --git a/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h b/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h
deleted file mode 100644
index 4972e9f..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtVolatileImage__
-#define __gnu_java_awt_peer_qt_QtVolatileImage__
-
-#pragma interface
-
-#include <java/awt/image/VolatileImage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QtGraphics;
-              class QtImage;
-              class QtImageGraphics;
-              class QtVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class Image;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtVolatileImage : public ::java::awt::image::VolatileImage
-{
-
-public:
-  virtual void clear();
-private:
-  JArray< jint > * getPixels();
-  void createImage();
-  void freeImage();
-public:
-  virtual void blit(::gnu::java::awt::peer::qt::QtImage *);
-  virtual void blit(::gnu::java::awt::peer::qt::QtImage *, jint, jint, jint, jint);
-private:
-  void createScaledImage(::gnu::java::awt::peer::qt::QtVolatileImage *, jint);
-  void drawPixels(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsScaled(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsTransformed(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *);
-public: // actually package-private
-  virtual void drawPixelsScaledFlipped(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-public:
-  QtVolatileImage(jint, jint);
-private:
-  QtVolatileImage(::gnu::java::awt::peer::qt::QtVolatileImage *, jint, jint, jint);
-public:
-  virtual void finalize();
-  virtual void dispose();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-public: // actually package-private
-  virtual void putPainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-  virtual void removePainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual jboolean contentsLost();
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual ::java::awt::ImageCapabilities * getCapabilities();
-  virtual jint getHeight();
-  virtual ::java::awt::image::BufferedImage * getSnapshot();
-  virtual jint getWidth();
-  virtual jint validate(::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::VolatileImage)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jlong nativeObject;
-  static ::java::awt::image::ColorModel * nativeModel;
-  ::java::util::WeakHashMap * painters;
-  jboolean killFlag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtVolatileImage__
diff --git a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
deleted file mode 100644
index 9e5a147..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtWindowPeer__
-#define __gnu_java_awt_peer_qt_QtWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtToolkit;
-              class QtWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtWindowPeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtWindowPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void toBack();
-  virtual void toFront();
-  virtual void setTitle(::java::lang::String *);
-  virtual void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h
deleted file mode 100644
index ffaa2b6..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-              class SwingButtonPeer$SwingButton;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer$SwingButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  SwingButtonPeer$SwingButton(::gnu::java::awt::peer::swing::SwingButtonPeer *, ::java::awt::Button *);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual ::java::awt::Container * getParent();
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::Button * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) button;
-  ::gnu::java::awt::peer::swing::SwingButtonPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h
deleted file mode 100644
index c6a6f9a..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-              class SwingButtonPeer$SwingButtonListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer$SwingButtonListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingButtonPeer$SwingButtonListener(::gnu::java::awt::peer::swing::SwingButtonPeer *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingButtonPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h
deleted file mode 100644
index cca199f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingButtonPeer(::java::awt::Button *);
-  virtual void setLabel(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h b/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h
deleted file mode 100644
index 1fd853b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCanvasPeer__
-#define __gnu_java_awt_peer_swing_SwingCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCanvasPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCanvasPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingCanvasPeer(::java::awt::Canvas *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h
deleted file mode 100644
index d50fe66..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
-
-#pragma interface
-
-#include <javax/swing/JCheckBox.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-              class SwingCheckboxPeer$SwingCheckbox;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckbox : public ::javax::swing::JCheckBox
-{
-
-public: // actually package-private
-  SwingCheckboxPeer$SwingCheckbox(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::javax::swing::JCheckBox)))) checkbox;
-  ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h
deleted file mode 100644
index 71517ae..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-              class SwingCheckboxPeer$SwingCheckboxListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckboxListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCheckboxPeer$SwingCheckboxListener(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtCheckbox;
-  ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h
deleted file mode 100644
index bceaa21..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingCheckboxPeer(::java::awt::Checkbox *);
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponent.h b/libjava/gnu/java/awt/peer/swing/SwingComponent.h
deleted file mode 100644
index 619a05e..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponent.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingComponent__
-#define __gnu_java_awt_peer_swing_SwingComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingComponent;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::JComponent * getJComponent() = 0;
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *) = 0;
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *) = 0;
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_peer_swing_SwingComponent__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h b/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h
deleted file mode 100644
index 5454968..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingComponentPeer__
-#define __gnu_java_awt_peer_swing_SwingComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingComponent;
-              class SwingComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  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 FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingComponentPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  SwingComponentPeer();
-  virtual void init(::java::awt::Component *, ::gnu::java::awt::peer::swing::SwingComponent *);
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void hide();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isFocusable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual void setEventMask(jlong);
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual jboolean handlesWheelScrolling();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-  virtual void peerPaintComponent(::java::awt::Graphics *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-public:
-  virtual ::java::awt::Component * getComponent();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtComponent;
-  ::gnu::java::awt::peer::swing::SwingComponent * swingComponent;
-  ::java::awt::Font * peerFont;
-  ::java::awt::Rectangle * paintArea;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h b/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h
deleted file mode 100644
index a3895c0..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingContainerPeer__
-#define __gnu_java_awt_peer_swing_SwingContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingContainerPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Image;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingContainerPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingContainerPeer(::java::awt::Container *);
-public: // actually protected
-  virtual void addHeavyweightDescendent(::java::awt::Component *);
-  virtual void removeHeavyweightDescendent(::java::awt::Component *);
-  virtual JArray< ::java::awt::Component * > * getHeavyweightDescendents();
-public:
-  virtual ::java::awt::Insets * insets();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-private:
-  jboolean isDoubleBuffering();
-public: // actually protected
-  virtual void peerPaintChildren(::java::awt::Graphics *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-private:
-  ::java::awt::Component * getFocusOwner();
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) heavyweightDescendents;
-  ::java::awt::Image * backbuffer;
-  ::java::awt::Component * focusOwner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h b/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h
deleted file mode 100644
index e09ee5d..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingFramePeer__
-#define __gnu_java_awt_peer_swing_SwingFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingFramePeer;
-              class SwingMenuBarPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Graphics;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingFramePeer : public ::gnu::java::awt::peer::swing::SwingWindowPeer
-{
-
-public:
-  SwingFramePeer(::java::awt::Frame *);
-  virtual void setMenuBar(::java::awt::MenuBar *);
-public: // actually protected
-  virtual void peerPaintComponent(::java::awt::Graphics *);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Point * getMenuLocationOnScreen();
-public: // actually protected
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public:
-  virtual void setIconImage(::java::awt::Image *) = 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 void setBoundsPrivate(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getBoundsPrivate() = 0;
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingWindowPeer)))) menuBar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingFramePeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h
deleted file mode 100644
index 561c810..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
-#define __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingLabelPeer;
-              class SwingLabelPeer$SwingLabel;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Label;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingLabelPeer$SwingLabel : public ::javax::swing::JLabel
-{
-
-public: // actually package-private
-  SwingLabelPeer$SwingLabel(::gnu::java::awt::peer::swing::SwingLabelPeer *, ::java::awt::Label *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-public: // actually package-private
-  ::java::awt::Label * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) label;
-  ::gnu::java::awt::peer::swing::SwingLabelPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h
deleted file mode 100644
index a400853..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingLabelPeer__
-#define __gnu_java_awt_peer_swing_SwingLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingLabelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingLabelPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingLabelPeer(::java::awt::Label *);
-  virtual void setText(::java::lang::String *);
-  virtual void setAlignment(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h b/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h
deleted file mode 100644
index 76b8b75..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
-#define __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
-
-#pragma interface
-
-#include <javax/swing/JScrollPane.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingListPeer;
-              class SwingListPeer$SwingList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingListPeer$SwingList : public ::javax::swing::JScrollPane
-{
-
-public: // actually package-private
-  SwingListPeer$SwingList(::gnu::java::awt::peer::swing::SwingListPeer *, ::java::awt::Component *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isLightweight();
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingListPeer * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingListPeer.h b/libjava/gnu/java/awt/peer/swing/SwingListPeer.h
deleted file mode 100644
index fa6fde6..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingListPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingListPeer__
-#define __gnu_java_awt_peer_swing_SwingListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingListPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class List;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListModel;
-        class JList;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingListPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingListPeer(::java::awt::List *);
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-private:
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jList;
-  ::javax::swing::DefaultListModel * listModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingListPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h b/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h
deleted file mode 100644
index 4ab74e8..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
-#define __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JMenuBar.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuBarPeer;
-              class SwingMenuBarPeer$SwingMenuBar;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar : public ::javax::swing::JMenuBar
-{
-
-  SwingMenuBarPeer$SwingMenuBar(::gnu::java::awt::peer::swing::SwingMenuBarPeer *);
-public:
-  virtual ::java::awt::Container * getParent();
-  virtual jboolean isShowing();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-public: // actually package-private
-  SwingMenuBarPeer$SwingMenuBar(::gnu::java::awt::peer::swing::SwingMenuBarPeer *, ::gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar *);
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h
deleted file mode 100644
index 3579476..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuBarPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuBarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingFramePeer;
-              class SwingMenuBarPeer;
-              class SwingMenuBarPeer$SwingMenuBar;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-        class Menu;
-        class MenuBar;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuBarPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuBarPeer(::java::awt::MenuBar *);
-  virtual void setFramePeer(::gnu::java::awt::peer::swing::SwingFramePeer *);
-  virtual void addMenu(::java::awt::Menu *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  virtual void setWidth(jint);
-  virtual void peerPaint(::java::awt::Graphics *);
-  virtual jint getHeight();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::java::awt::MenuBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenuBar;
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar * menuBar;
-  ::gnu::java::awt::peer::swing::SwingFramePeer * framePeer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h b/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h
deleted file mode 100644
index 1aa993b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
-#define __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuItemPeer;
-              class SwingMenuItemPeer$SwingMenuItemListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuItemPeer$SwingMenuItemListener : public ::java::lang::Object
-{
-
-  SwingMenuItemPeer$SwingMenuItemListener(::gnu::java::awt::peer::swing::SwingMenuItemPeer *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  SwingMenuItemPeer$SwingMenuItemListener(::gnu::java::awt::peer::swing::SwingMenuItemPeer *, ::gnu::java::awt::peer::swing::SwingMenuItemPeer$SwingMenuItemListener *);
-  ::gnu::java::awt::peer::swing::SwingMenuItemPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h
deleted file mode 100644
index f79e2d2..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuItemPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuItemPeer(::java::awt::MenuItem *);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-public: // actually package-private
-  ::java::awt::MenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenuItem;
-  ::javax::swing::JMenuItem * menuItem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h b/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h
deleted file mode 100644
index 1de2bee..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
-#define __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenu.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuPeer;
-              class SwingMenuPeer$SwingMenu;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu : public ::javax::swing::JMenu
-{
-
-  SwingMenuPeer$SwingMenu(::gnu::java::awt::peer::swing::SwingMenuPeer *);
-public:
-  virtual jboolean isShowing();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  SwingMenuPeer$SwingMenu(::gnu::java::awt::peer::swing::SwingMenuPeer *, ::gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu *);
-  ::gnu::java::awt::peer::swing::SwingMenuPeer * __attribute__((aligned(__alignof__( ::javax::swing::JMenu)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h
deleted file mode 100644
index 988b481..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuPeer;
-              class SwingMenuPeer$SwingMenu;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Menu;
-        class MenuItem;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuPeer(::java::awt::Menu *);
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addSeparator();
-  virtual void delItem(jint);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint getX();
-  virtual jint getWidth();
-public:
-  virtual jint getY();
-public: // actually package-private
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenu;
-  ::gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu * menu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h b/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h
deleted file mode 100644
index 3b9f61b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingPanelPeer__
-#define __gnu_java_awt_peer_swing_SwingPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingPanelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Panel;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingPanelPeer : public ::gnu::java::awt::peer::swing::SwingContainerPeer
-{
-
-public:
-  SwingPanelPeer(::java::awt::Panel *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h
deleted file mode 100644
index 77c1529..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
-
-#pragma interface
-
-#include <javax/swing/JViewport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$1;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$1 : public ::javax::swing::JViewport
-{
-
-public: // actually package-private
-  SwingTextAreaPeer$1(::gnu::java::awt::peer::swing::SwingTextAreaPeer *);
-public:
-  virtual ::java::awt::Image * createImage(jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h
deleted file mode 100644
index 040c7f0..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JScrollPane.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingScrollPane;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingScrollPane : public ::javax::swing::JScrollPane
-{
-
-public: // actually package-private
-  SwingTextAreaPeer$SwingScrollPane(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isLightweight();
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) textArea;
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
deleted file mode 100644
index fe39275..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
-
-#pragma interface
-
-#include <javax/swing/JTextArea.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-          class FocusEvent;
-          class HierarchyEvent;
-          class InputMethodEvent;
-          class KeyEvent;
-          class MouseEvent;
-          class MouseWheelEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea : public ::javax::swing::JTextArea
-{
-
-  SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *);
-public: // actually protected
-  virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void processComponentEvent(::java::awt::event::ComponentEvent *);
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void processHierarchyBoundsEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processHierarchyEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processInputMethodEvent(::java::awt::event::InputMethodEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseWheelEvent(::java::awt::event::MouseWheelEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *);
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JTextArea)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h
deleted file mode 100644
index 2e58f53..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingTextAreaPeer(::java::awt::TextArea *);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setCaretPosition(jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual void reshape(jint, jint, jint, jint);
-private:
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jTextArea;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h
deleted file mode 100644
index 3a46f67..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
-#define __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextFieldPeer;
-              class SwingTextFieldPeer$SwingTextField;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-        class TextField;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextFieldPeer$SwingTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  SwingTextFieldPeer$SwingTextField(::gnu::java::awt::peer::swing::SwingTextFieldPeer *, ::java::awt::TextField *);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Container * getParent();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::TextField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) textField;
-  ::gnu::java::awt::peer::swing::SwingTextFieldPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h
deleted file mode 100644
index 43d26d5..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextFieldPeer__
-#define __gnu_java_awt_peer_swing_SwingTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextFieldPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextFieldPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingTextFieldPeer(::java::awt::TextField *);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual void setEchoChar(jchar);
-  virtual void setEchoCharacter(jchar);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h b/libjava/gnu/java/awt/peer/swing/SwingToolkit.h
deleted file mode 100644
index 9572f3f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingToolkit__
-#define __gnu_java_awt_peer_swing_SwingToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Label;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class TextField;
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class LabelPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class TextFieldPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public:
-  SwingToolkit();
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-public:
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingToolkit__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h b/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h
deleted file mode 100644
index c4fc73f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingWindowPeer__
-#define __gnu_java_awt_peer_swing_SwingWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingWindowPeer : public ::gnu::java::awt::peer::swing::SwingContainerPeer
-{
-
-public:
-  SwingWindowPeer(::java::awt::Window *);
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingWindowPeer__
diff --git a/libjava/gnu/java/awt/print/JavaPrinterGraphics.h b/libjava/gnu/java/awt/print/JavaPrinterGraphics.h
deleted file mode 100644
index 7809034..0000000
--- a/libjava/gnu/java/awt/print/JavaPrinterGraphics.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_JavaPrinterGraphics__
-#define __gnu_java_awt_print_JavaPrinterGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class JavaPrinterGraphics;
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-      }
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::print::JavaPrinterGraphics : public ::java::awt::Graphics
-{
-
-public:
-  JavaPrinterGraphics(::java::awt::print::PrinterJob *);
-  virtual ::gnu::java::awt::print::SpooledDocument * spoolPostScript(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, ::java::awt::print::Pageable *);
-  virtual jint spoolPage(::java::io::PrintWriter *, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-private:
-  void initImage(::java::awt::print::PageFormat *);
-  void writePSHeader(::java::io::PrintWriter *);
-  void writePage(::java::io::PrintWriter *, ::java::awt::print::PageFormat *);
-  ::java::lang::String * colorTripleHex(jint);
-  void concatCTM(::java::io::PrintWriter *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual ::java::awt::print::PrinterJob * getPrinterJob();
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Graphics * create();
-  virtual void dispose();
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual void setColor(::java::awt::Color *);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void translate(jint, jint);
-private:
-  ::java::awt::Graphics * __attribute__((aligned(__alignof__( ::java::awt::Graphics)))) g;
-  ::java::awt::print::PrinterJob * printerJob;
-  static jdouble DPI;
-  jint xSize;
-  jint ySize;
-  ::java::awt::Image * image;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_JavaPrinterGraphics__
diff --git a/libjava/gnu/java/awt/print/JavaPrinterJob.h b/libjava/gnu/java/awt/print/JavaPrinterJob.h
deleted file mode 100644
index 6275b13..0000000
--- a/libjava/gnu/java/awt/print/JavaPrinterJob.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_JavaPrinterJob__
-#define __gnu_java_awt_print_JavaPrinterJob__
-
-#pragma interface
-
-#include <java/awt/print/PrinterJob.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class JavaPrinterJob;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::print::JavaPrinterJob : public ::java::awt::print::PrinterJob
-{
-
-public:
-  JavaPrinterJob();
-private:
-  void getPageAttributes();
-public:
-  virtual jint getCopies();
-  virtual void setCopies(jint);
-  virtual ::java::lang::String * getJobName();
-  virtual void setJobName(::java::lang::String *);
-  virtual ::java::lang::String * getUserName();
-  virtual void cancel();
-  virtual jboolean isCancelled();
-  virtual ::java::awt::print::PageFormat * defaultPage(::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * pageDialog(::java::awt::print::PageFormat *);
-  virtual void print();
-  virtual void print(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual jboolean printDialog();
-  virtual jboolean printDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void setPageable(::java::awt::print::Pageable *);
-  virtual void setPrintable(::java::awt::print::Printable *);
-  virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *);
-  virtual void setPrintService(::javax::print::PrintService *);
-private:
-  ::javax::print::PrintService * __attribute__((aligned(__alignof__( ::java::awt::print::PrinterJob)))) printer;
-  ::javax::print::attribute::PrintRequestAttributeSet * attributes;
-  static JArray< ::javax::print::PrintService * > * services;
-  ::javax::print::DocPrintJob * printJob;
-  ::java::awt::print::Printable * printable;
-  ::java::awt::print::PageFormat * pageFormat;
-  ::java::awt::print::Pageable * pageable;
-  jboolean cancelled;
-  static ::java::lang::Class * copyClass;
-  static ::java::lang::Class * jobNameClass;
-  static ::java::lang::Class * userNameClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_JavaPrinterJob__
diff --git a/libjava/gnu/java/awt/print/PostScriptGraphics2D.h b/libjava/gnu/java/awt/print/PostScriptGraphics2D.h
deleted file mode 100644
index 4601104..0000000
--- a/libjava/gnu/java/awt/print/PostScriptGraphics2D.h
+++ /dev/null
@@ -1,211 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_PostScriptGraphics2D__
-#define __gnu_java_awt_print_PostScriptGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class PostScriptGraphics2D;
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::print::PostScriptGraphics2D : public ::java::awt::Graphics2D
-{
-
-public:
-  PostScriptGraphics2D(::java::awt::print::PrinterJob *);
-  virtual ::gnu::java::awt::print::SpooledDocument * spoolPostScript(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, ::java::awt::print::Pageable *);
-private:
-  void writePSHeader();
-  void setupFonts();
-public:
-  virtual jint spoolPage(::java::io::PrintWriter *, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-private:
-  void pushCTM();
-  void popCTM();
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-private:
-  void drawStringPSFont(::java::lang::String *, jfloat, jfloat);
-  void saveAndInvertAxis();
-  void restoreAxis();
-  void drawStringShape(::java::awt::Shape *);
-public:
-  virtual void setColor(::java::awt::Color *);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void dispose();
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setFont(::java::awt::Font *);
-private:
-  void setPSFont();
-public:
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void close();
-  virtual void addRenderingHints(::java::util::Map *);
-private:
-  void writeShape(::java::awt::Shape *);
-public:
-  virtual void clip(::java::awt::Shape *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void fill(::java::awt::Shape *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Composite * getComposite();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::Stroke * getStroke();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setComposite(::java::awt::Composite *);
-  virtual void setPaint(::java::awt::Paint *);
-private:
-  ::java::lang::String * colorTriple(::java::awt::Color *);
-  ::java::lang::String * colorTripleHex(::java::awt::Color *);
-  void writeGradient();
-public:
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void setStroke(::java::awt::Stroke *);
-private:
-  void concatCTM(::java::awt::geom::AffineTransform *);
-public:
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void shear(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-private:
-  ::java::awt::print::PrinterJob * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) printerJob;
-  ::java::io::PrintWriter * out;
-  ::java::awt::geom::AffineTransform * currentTransform;
-  ::java::awt::geom::AffineTransform * pageTransform;
-  ::java::awt::RenderingHints * renderingHints;
-  ::java::awt::Paint * currentPaint;
-  ::java::awt::Shape * clipShape;
-  ::java::awt::Font * currentFont;
-  ::java::awt::Color * currentColor;
-  ::java::awt::Color * backgroundColor;
-  ::java::awt::Stroke * currentStroke;
-  static ::java::awt::Stroke * ordinaryStroke;
-  jfloat cx;
-  jfloat cy;
-  jboolean currentFontIsPS;
-  jdouble pageX;
-  jdouble pageY;
-  jdouble Y;
-  jboolean gradientOn;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_PostScriptGraphics2D__
diff --git a/libjava/gnu/java/awt/print/SpooledDocument.h b/libjava/gnu/java/awt/print/SpooledDocument.h
deleted file mode 100644
index a49bb14..0000000
--- a/libjava/gnu/java/awt/print/SpooledDocument.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_SpooledDocument__
-#define __gnu_java_awt_print_SpooledDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::print::SpooledDocument : public ::java::lang::Object
-{
-
-public:
-  SpooledDocument(::java::io::File *);
-  virtual ::javax::print::attribute::DocAttributeSet * getAttributes();
-  virtual ::javax::print::DocFlavor * getDocFlavor();
-  virtual ::java::lang::Object * getPrintData();
-  virtual ::java::io::Reader * getReaderForText();
-  virtual ::java::io::InputStream * getStreamForBytes();
-private:
-  ::java::io::FileInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_SpooledDocument__