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

62 files changed, 0 insertions, 3523 deletions

diff --git a/libjava/java/awt/image/AffineTransformOp.h b/libjava/java/awt/image/AffineTransformOp.h
deleted file mode 100644
index be0dee4..0000000
--- a/libjava/java/awt/image/AffineTransformOp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AffineTransformOp__
-#define __java_awt_image_AffineTransformOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class AffineTransformOp;
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::AffineTransformOp : public ::java::lang::Object
-{
-
-public:
-  AffineTransformOp(::java::awt::geom::AffineTransform *, jint);
-  AffineTransformOp(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual jint getInterpolationType();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-private:
-  void filterNearest(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBilinear(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBicubic(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-public:
-  static const jint TYPE_NEAREST_NEIGHBOR = 1;
-  static const jint TYPE_BILINEAR = 2;
-  static const jint TYPE_BICUBIC = 3;
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) transform;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AffineTransformOp__
diff --git a/libjava/java/awt/image/AreaAveragingScaleFilter.h b/libjava/java/awt/image/AreaAveragingScaleFilter.h
deleted file mode 100644
index 694ae79a..0000000
--- a/libjava/java/awt/image/AreaAveragingScaleFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AreaAveragingScaleFilter__
-#define __java_awt_image_AreaAveragingScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ReplicateScaleFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class AreaAveragingScaleFilter;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::AreaAveragingScaleFilter : public ::java::awt::image::ReplicateScaleFilter
-{
-
-public:
-  AreaAveragingScaleFilter(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jbyte > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jdouble, jdouble, jint);
-  JArray< jint > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jdouble, jdouble, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AreaAveragingScaleFilter__
diff --git a/libjava/java/awt/image/BandCombineOp.h b/libjava/java/awt/image/BandCombineOp.h
deleted file mode 100644
index 0233ef4..0000000
--- a/libjava/java/awt/image/BandCombineOp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandCombineOp__
-#define __java_awt_image_BandCombineOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BandCombineOp;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandCombineOp : public ::java::lang::Object
-{
-
-public:
-  BandCombineOp(JArray< JArray< jfloat > * > *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual JArray< JArray< jfloat > * > * getMatrix();
-private:
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< JArray< jfloat > * > * matrix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandCombineOp__
diff --git a/libjava/java/awt/image/BandedSampleModel.h b/libjava/java/awt/image/BandedSampleModel.h
deleted file mode 100644
index 5eca819..0000000
--- a/libjava/java/awt/image/BandedSampleModel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandedSampleModel__
-#define __java_awt_image_BandedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BandedSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-  static JArray< jint > * createBankArray(jint);
-public:
-  BandedSampleModel(jint, jint, jint, jint);
-  BandedSampleModel(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  ::java::awt::image::DataBuffer * createDataBuffer();
-  ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ComponentSampleModel)))) bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandedSampleModel__
diff --git a/libjava/java/awt/image/BufferStrategy.h b/libjava/java/awt/image/BufferStrategy.h
deleted file mode 100644
index 682e73e..0000000
--- a/libjava/java/awt/image/BufferStrategy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferStrategy__
-#define __java_awt_image_BufferStrategy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Graphics;
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferStrategy : public ::java::lang::Object
-{
-
-public:
-  BufferStrategy();
-  virtual ::java::awt::BufferCapabilities * getCapabilities() = 0;
-  virtual ::java::awt::Graphics * getDrawGraphics() = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual jboolean contentsRestored() = 0;
-  virtual void show() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferStrategy__
diff --git a/libjava/java/awt/image/BufferedImage$1.h b/libjava/java/awt/image/BufferedImage$1.h
deleted file mode 100644
index d14d34e..0000000
--- a/libjava/java/awt/image/BufferedImage$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage$1__
-#define __java_awt_image_BufferedImage$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImage$1;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BufferedImage$1(::java::awt::image::BufferedImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-  ::java::awt::image::BufferedImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage$1__
diff --git a/libjava/java/awt/image/BufferedImage.h b/libjava/java/awt/image/BufferedImage.h
deleted file mode 100644
index 9c54907..0000000
--- a/libjava/java/awt/image/BufferedImage.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage__
-#define __java_awt_image_BufferedImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage : public ::java::awt::Image
-{
-
-public:
-  BufferedImage(jint, jint, jint);
-  BufferedImage(jint, jint, jint, ::java::awt::image::IndexColorModel *);
-  BufferedImage(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *);
-private:
-  void init(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *, jint);
-  ::java::awt::image::IndexColorModel * createDefaultIndexedColorModel(jboolean);
-public:
-  virtual void coerceData(jboolean);
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *);
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual void flush();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getData();
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual jint getMinTileX();
-  virtual jint getMinTileY();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getNumXTiles();
-  virtual jint getNumYTiles();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jint getRGB(jint, jint);
-  virtual JArray< jint > * getRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::awt::image::WritableRaster * getRaster();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::awt::image::BufferedImage * getSubimage(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * getTile(jint, jint);
-  virtual jint getTileGridXOffset();
-  virtual jint getTileGridYOffset();
-  virtual jint getTileHeight();
-  virtual jint getTileWidth();
-  virtual jint getType();
-  virtual jint getWidth();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint);
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices();
-  virtual jboolean hasTileWriters();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jboolean isTileWritable(jint, jint);
-  virtual void releaseWritableTile(jint, jint);
-  virtual void setData(::java::awt::image::Raster *);
-  virtual void setRGB(jint, jint, jint);
-  virtual void setRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual void addTileObserver(::java::awt::image::TileObserver *);
-  virtual void removeTileObserver(::java::awt::image::TileObserver *);
-  virtual jint getTransparency();
-  static const jint TYPE_CUSTOM = 0;
-  static const jint TYPE_INT_RGB = 1;
-  static const jint TYPE_INT_ARGB = 2;
-  static const jint TYPE_INT_ARGB_PRE = 3;
-  static const jint TYPE_INT_BGR = 4;
-  static const jint TYPE_3BYTE_BGR = 5;
-  static const jint TYPE_4BYTE_ABGR = 6;
-  static const jint TYPE_4BYTE_ABGR_PRE = 7;
-  static const jint TYPE_USHORT_565_RGB = 8;
-  static const jint TYPE_USHORT_555_RGB = 9;
-  static const jint TYPE_BYTE_GRAY = 10;
-  static const jint TYPE_USHORT_GRAY = 11;
-  static const jint TYPE_BYTE_BINARY = 12;
-  static const jint TYPE_BYTE_INDEXED = 13;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Image)))) tileObservers;
-  ::java::awt::image::WritableRaster * raster;
-  ::java::awt::image::ColorModel * colorModel;
-  ::java::util::Hashtable * properties;
-  jboolean isPremultiplied;
-  jint type;
-private:
-  static JArray< ::java::awt::Point * > * tileIndices;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage__
diff --git a/libjava/java/awt/image/BufferedImageFilter.h b/libjava/java/awt/image/BufferedImageFilter.h
deleted file mode 100644
index 08da9be..0000000
--- a/libjava/java/awt/image/BufferedImageFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageFilter__
-#define __java_awt_image_BufferedImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImageFilter;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  BufferedImageFilter(::java::awt::image::BufferedImageOp *);
-  virtual ::java::awt::image::BufferedImageOp * getBufferedImageOp();
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  ::java::awt::image::BufferedImageOp * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImageFilter__
diff --git a/libjava/java/awt/image/BufferedImageOp.h b/libjava/java/awt/image/BufferedImageOp.h
deleted file mode 100644
index 1af69aa..0000000
--- a/libjava/java/awt/image/BufferedImageOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageOp__
-#define __java_awt_image_BufferedImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_BufferedImageOp__
diff --git a/libjava/java/awt/image/ByteLookupTable.h b/libjava/java/awt/image/ByteLookupTable.h
deleted file mode 100644
index d34b385..0000000
--- a/libjava/java/awt/image/ByteLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ByteLookupTable__
-#define __java_awt_image_ByteLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ByteLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ByteLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ByteLookupTable(jint, JArray< JArray< jbyte > * > *);
-  ByteLookupTable(jint, JArray< jbyte > *);
-  virtual JArray< JArray< jbyte > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jbyte > * lookupPixel(JArray< jbyte > *, JArray< jbyte > *);
-private:
-  JArray< JArray< jbyte > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ByteLookupTable__
diff --git a/libjava/java/awt/image/ColorConvertOp.h b/libjava/java/awt/image/ColorConvertOp.h
deleted file mode 100644
index 6455b46..0000000
--- a/libjava/java/awt/image/ColorConvertOp.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorConvertOp__
-#define __java_awt_image_ColorConvertOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace color
-      {
-          class ColorSpace;
-          class ICC_Profile;
-      }
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorConvertOp;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorConvertOp : public ::java::lang::Object
-{
-
-public:
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(JArray< ::java::awt::color::ICC_Profile * > *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual JArray< ::java::awt::color::ICC_Profile * > * getICC_Profiles();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-private:
-  void copyimage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  void copyraster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, ::java::awt::image::WritableRaster *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::ColorModel * createCompatibleColorModel(::java::awt::image::BufferedImage *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, jboolean, jint);
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< ::java::awt::color::ICC_Profile * > * profiles;
-  JArray< ::java::awt::color::ColorSpace * > * spaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorConvertOp__
diff --git a/libjava/java/awt/image/ColorModel$SRGBColorModel.h b/libjava/java/awt/image/ColorModel$SRGBColorModel.h
deleted file mode 100644
index 90428c4..0000000
--- a/libjava/java/awt/image/ColorModel$SRGBColorModel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel$SRGBColorModel__
-#define __java_awt_image_ColorModel$SRGBColorModel__
-
-#pragma interface
-
-#include <java/awt/image/DirectColorModel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel$SRGBColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel$SRGBColorModel : public ::java::awt::image::DirectColorModel
-{
-
-public: // actually package-private
-  ColorModel$SRGBColorModel();
-public:
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel$SRGBColorModel__
diff --git a/libjava/java/awt/image/ColorModel.h b/libjava/java/awt/image/ColorModel.h
deleted file mode 100644
index 1eccdc5..0000000
--- a/libjava/java/awt/image/ColorModel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel__
-#define __java_awt_image_ColorModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static JArray< jint > * nArray(jint, jint);
-  static JArray< jbyte > * nArray(jbyte, jint);
-public:
-  ColorModel(jint);
-public: // actually protected
-  ColorModel(jint, JArray< jint > *, ::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-public:
-  virtual void finalize();
-  static ::java::awt::image::ColorModel * getRGBdefault();
-  virtual jboolean hasAlpha();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jint getPixelSize();
-  virtual jint getComponentSize(jint);
-  virtual JArray< jint > * getComponentSize();
-  virtual jint getTransparency();
-  virtual jint getNumComponents();
-  virtual jint getNumColorComponents();
-  virtual jint getRed(jint) = 0;
-  virtual jint getGreen(jint) = 0;
-  virtual jint getBlue(jint) = 0;
-  virtual jint getAlpha(jint) = 0;
-  virtual jint getRGB(jint);
-public: // actually package-private
-  virtual jint getPixelFromArray(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual JArray< jint > * getUnnormalizedComponents(JArray< jfloat > *, jint, JArray< jint > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(JArray< jint > *, jint, JArray< jfloat > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(::java::lang::Object *, JArray< jfloat > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jfloat > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(JArray< jfloat > *, jint, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-public: // actually package-private
-  virtual void coerceDataWorker(::java::awt::image::WritableRaster *, jboolean);
-public:
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual jint getTransferType();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pixel_bits;
-  jint transferType;
-public: // actually package-private
-  JArray< jint > * bits;
-  ::java::awt::color::ColorSpace * cspace;
-  jint transparency;
-  jboolean hasAlpha__;
-  jboolean isAlphaPremultiplied__;
-private:
-  static ::java::awt::image::ColorModel * S_RGB_MODEL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel__
diff --git a/libjava/java/awt/image/ComponentColorModel.h b/libjava/java/awt/image/ComponentColorModel.h
deleted file mode 100644
index e40ab1d..0000000
--- a/libjava/java/awt/image/ComponentColorModel.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentColorModel__
-#define __java_awt_image_ComponentColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ComponentColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentColorModel : public ::java::awt::image::ColorModel
-{
-
-  static jint sum(JArray< jint > *);
-  static JArray< jint > * findBits(::java::awt::color::ColorSpace *, jint, jboolean);
-public:
-  ComponentColorModel(::java::awt::color::ColorSpace *, JArray< jint > *, jboolean, jboolean, jint, jint);
-  ComponentColorModel(::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-private:
-  JArray< jfloat > * getRGBFloat(jint);
-  JArray< jfloat > * getRGBFloat(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-private:
-  jint getRGB(JArray< jfloat > *);
-public:
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentColorModel__
diff --git a/libjava/java/awt/image/ComponentSampleModel.h b/libjava/java/awt/image/ComponentSampleModel.h
deleted file mode 100644
index 39fe6cd..0000000
--- a/libjava/java/awt/image/ComponentSampleModel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentSampleModel__
-#define __java_awt_image_ComponentSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ComponentSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getOffset(jint, jint);
-  virtual jint getOffset(jint, jint, jint);
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual JArray< jint > * getBankIndices();
-  virtual JArray< jint > * getBandOffsets();
-  virtual jint getScanlineStride();
-  virtual jint getPixelStride();
-  virtual jint getNumDataElements();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) bandOffsets;
-  JArray< jint > * bankIndices;
-  jint numBands;
-  jint numBanks;
-  jint scanlineStride;
-  jint pixelStride;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentSampleModel__
diff --git a/libjava/java/awt/image/ConvolveOp.h b/libjava/java/awt/image/ConvolveOp.h
deleted file mode 100644
index e72a703..0000000
--- a/libjava/java/awt/image/ConvolveOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ConvolveOp__
-#define __java_awt_image_ConvolveOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ConvolveOp;
-          class Kernel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ConvolveOp : public ::java::lang::Object
-{
-
-public:
-  ConvolveOp(::java::awt::image::Kernel *, jint, ::java::awt::RenderingHints *);
-  ConvolveOp(::java::awt::image::Kernel *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual jint getEdgeCondition();
-  virtual ::java::awt::image::Kernel * getKernel();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  void fillEdge(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  static const jint EDGE_ZERO_FILL = 0;
-  static const jint EDGE_NO_OP = 1;
-private:
-  ::java::awt::image::Kernel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kernel;
-  jint edge;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ConvolveOp__
diff --git a/libjava/java/awt/image/CropImageFilter.h b/libjava/java/awt/image/CropImageFilter.h
deleted file mode 100644
index 23720db..0000000
--- a/libjava/java/awt/image/CropImageFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_CropImageFilter__
-#define __java_awt_image_CropImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class CropImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::CropImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  CropImageFilter(jint, jint, jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) x;
-  jint y;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_CropImageFilter__
diff --git a/libjava/java/awt/image/DataBuffer.h b/libjava/java/awt/image/DataBuffer.h
deleted file mode 100644
index 5bb4ac2..0000000
--- a/libjava/java/awt/image/DataBuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBuffer__
-#define __java_awt_image_DataBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBuffer : public ::java::lang::Object
-{
-
-public: // actually protected
-  DataBuffer(jint, jint);
-  DataBuffer(jint, jint, jint);
-  DataBuffer(jint, jint, jint, jint);
-  DataBuffer(jint, jint, jint, JArray< jint > *);
-public:
-  static jint getDataTypeSize(jint);
-  virtual jint getDataType();
-  virtual jint getSize();
-  virtual jint getOffset();
-  virtual JArray< jint > * getOffsets();
-  virtual jint getNumBanks();
-  virtual jint getElem(jint);
-  virtual jint getElem(jint, jint) = 0;
-  virtual void setElem(jint, jint);
-  virtual void setElem(jint, jint, jint) = 0;
-  virtual jfloat getElemFloat(jint);
-  virtual jfloat getElemFloat(jint, jint);
-  virtual void setElemFloat(jint, jfloat);
-  virtual void setElemFloat(jint, jint, jfloat);
-  virtual jdouble getElemDouble(jint);
-  virtual jdouble getElemDouble(jint, jint);
-  virtual void setElemDouble(jint, jdouble);
-  virtual void setElemDouble(jint, jint, jdouble);
-  static const jint TYPE_BYTE = 0;
-  static const jint TYPE_USHORT = 1;
-  static const jint TYPE_SHORT = 2;
-  static const jint TYPE_INT = 3;
-  static const jint TYPE_FLOAT = 4;
-  static const jint TYPE_DOUBLE = 5;
-  static const jint TYPE_UNDEFINED = 32;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataType;
-  jint banks;
-  jint offset;
-  jint size;
-  JArray< jint > * offsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBuffer__
diff --git a/libjava/java/awt/image/DataBufferByte.h b/libjava/java/awt/image/DataBufferByte.h
deleted file mode 100644
index 224be27..0000000
--- a/libjava/java/awt/image/DataBufferByte.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferByte__
-#define __java_awt_image_DataBufferByte__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferByte;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferByte : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferByte(jint);
-  DataBufferByte(jint, jint);
-  DataBufferByte(JArray< jbyte > *, jint);
-  DataBufferByte(JArray< jbyte > *, jint, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint, JArray< jint > *);
-  JArray< jbyte > * getData();
-  JArray< jbyte > * getData(jint);
-  JArray< JArray< jbyte > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jbyte > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferByte__
diff --git a/libjava/java/awt/image/DataBufferDouble.h b/libjava/java/awt/image/DataBufferDouble.h
deleted file mode 100644
index 056c5e4..0000000
--- a/libjava/java/awt/image/DataBufferDouble.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferDouble__
-#define __java_awt_image_DataBufferDouble__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferDouble;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferDouble : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferDouble(jint);
-  DataBufferDouble(jint, jint);
-  DataBufferDouble(JArray< jdouble > *, jint);
-  DataBufferDouble(JArray< jdouble > *, jint, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint, JArray< jint > *);
-  JArray< jdouble > * getData();
-  JArray< jdouble > * getData(jint);
-  JArray< JArray< jdouble > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jdouble > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferDouble__
diff --git a/libjava/java/awt/image/DataBufferFloat.h b/libjava/java/awt/image/DataBufferFloat.h
deleted file mode 100644
index 621e359..0000000
--- a/libjava/java/awt/image/DataBufferFloat.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferFloat__
-#define __java_awt_image_DataBufferFloat__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferFloat;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferFloat : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferFloat(jint);
-  DataBufferFloat(jint, jint);
-  DataBufferFloat(JArray< jfloat > *, jint);
-  DataBufferFloat(JArray< jfloat > *, jint, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint, JArray< jint > *);
-  JArray< jfloat > * getData();
-  JArray< jfloat > * getData(jint);
-  JArray< JArray< jfloat > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jfloat > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferFloat__
diff --git a/libjava/java/awt/image/DataBufferInt.h b/libjava/java/awt/image/DataBufferInt.h
deleted file mode 100644
index 0526f60..0000000
--- a/libjava/java/awt/image/DataBufferInt.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferInt__
-#define __java_awt_image_DataBufferInt__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferInt;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferInt : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferInt(jint);
-  DataBufferInt(jint, jint);
-  DataBufferInt(JArray< jint > *, jint);
-  DataBufferInt(JArray< jint > *, jint, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint, JArray< jint > *);
-  JArray< jint > * getData();
-  JArray< jint > * getData(jint);
-  JArray< JArray< jint > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jint > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferInt__
diff --git a/libjava/java/awt/image/DataBufferShort.h b/libjava/java/awt/image/DataBufferShort.h
deleted file mode 100644
index c660671..0000000
--- a/libjava/java/awt/image/DataBufferShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferShort__
-#define __java_awt_image_DataBufferShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferShort(jint);
-  DataBufferShort(jint, jint);
-  DataBufferShort(JArray< jshort > *, jint);
-  DataBufferShort(JArray< jshort > *, jint, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferShort__
diff --git a/libjava/java/awt/image/DataBufferUShort.h b/libjava/java/awt/image/DataBufferUShort.h
deleted file mode 100644
index e67d26b..0000000
--- a/libjava/java/awt/image/DataBufferUShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferUShort__
-#define __java_awt_image_DataBufferUShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferUShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferUShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferUShort(jint);
-  DataBufferUShort(jint, jint);
-  DataBufferUShort(JArray< jshort > *, jint);
-  DataBufferUShort(JArray< jshort > *, jint, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferUShort__
diff --git a/libjava/java/awt/image/DirectColorModel.h b/libjava/java/awt/image/DirectColorModel.h
deleted file mode 100644
index 476ab07..0000000
--- a/libjava/java/awt/image/DirectColorModel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DirectColorModel__
-#define __java_awt_image_DirectColorModel__
-
-#pragma interface
-
-#include <java/awt/image/PackedColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class DirectColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::DirectColorModel : public ::java::awt::image::PackedColorModel
-{
-
-public:
-  DirectColorModel(jint, jint, jint, jint);
-  DirectColorModel(jint, jint, jint, jint, jint);
-  DirectColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint);
-  virtual jint getRedMask();
-  virtual jint getGreenMask();
-  virtual jint getBlueMask();
-  virtual jint getAlphaMask();
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-private:
-  jint extractAndNormalizeSample(jint, jint);
-  jint extractAndScaleSample(jint, jint);
-public:
-  virtual jint getRGB(jint);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-private:
-  jint valueToField(jint, jint, jint);
-  jint value16ToField(jint, jint);
-public:
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DirectColorModel__
diff --git a/libjava/java/awt/image/FilteredImageSource.h b/libjava/java/awt/image/FilteredImageSource.h
deleted file mode 100644
index 93174c4..0000000
--- a/libjava/java/awt/image/FilteredImageSource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_FilteredImageSource__
-#define __java_awt_image_FilteredImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class FilteredImageSource;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::FilteredImageSource : public ::java::lang::Object
-{
-
-public:
-  FilteredImageSource(::java::awt::image::ImageProducer *, ::java::awt::image::ImageFilter *);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-public: // actually package-private
-  ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ip;
-  ::java::awt::image::ImageFilter * filter;
-  ::java::util::Hashtable * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_FilteredImageSource__
diff --git a/libjava/java/awt/image/ImageConsumer.h b/libjava/java/awt/image/ImageConsumer.h
deleted file mode 100644
index ffca9fc..0000000
--- a/libjava/java/awt/image/ImageConsumer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageConsumer__
-#define __java_awt_image_ImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual void setDimensions(jint, jint) = 0;
-  virtual void setProperties(::java::util::Hashtable *) = 0;
-  virtual void setColorModel(::java::awt::image::ColorModel *) = 0;
-  virtual void setHints(jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint) = 0;
-  virtual void imageComplete(jint) = 0;
-  static const jint RANDOMPIXELORDER = 1;
-  static const jint TOPDOWNLEFTRIGHT = 2;
-  static const jint COMPLETESCANLINES = 4;
-  static const jint SINGLEPASS = 8;
-  static const jint SINGLEFRAME = 16;
-  static const jint IMAGEERROR = 1;
-  static const jint SINGLEFRAMEDONE = 2;
-  static const jint STATICIMAGEDONE = 3;
-  static const jint IMAGEABORTED = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageConsumer__
diff --git a/libjava/java/awt/image/ImageFilter.h b/libjava/java/awt/image/ImageFilter.h
deleted file mode 100644
index 84b6f53..0000000
--- a/libjava/java/awt/image/ImageFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageFilter__
-#define __java_awt_image_ImageFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageFilter : public ::java::lang::Object
-{
-
-public:
-  ImageFilter();
-  virtual void resendTopDownLeftRight(::java::awt::image::ImageProducer *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::ImageFilter * getFilterInstance(::java::awt::image::ImageConsumer *);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-public: // actually protected
-  ::java::awt::image::ImageConsumer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImageFilter__
diff --git a/libjava/java/awt/image/ImageObserver.h b/libjava/java/awt/image/ImageObserver.h
deleted file mode 100644
index 563666a..0000000
--- a/libjava/java/awt/image/ImageObserver.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageObserver__
-#define __java_awt_image_ImageObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageObserver : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint) = 0;
-  static const jint WIDTH = 1;
-  static const jint HEIGHT = 2;
-  static const jint PROPERTIES = 4;
-  static const jint SOMEBITS = 8;
-  static const jint FRAMEBITS = 16;
-  static const jint ALLBITS = 32;
-  static const jint ERROR = 64;
-  static const jint ABORT = 128;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageObserver__
diff --git a/libjava/java/awt/image/ImageProducer.h b/libjava/java/awt/image/ImageProducer.h
deleted file mode 100644
index 108f61f..0000000
--- a/libjava/java/awt/image/ImageProducer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageProducer__
-#define __java_awt_image_ImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageProducer : public ::java::lang::Object
-{
-
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void startProduction(::java::awt::image::ImageConsumer *) = 0;
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageProducer__
diff --git a/libjava/java/awt/image/ImagingOpException.h b/libjava/java/awt/image/ImagingOpException.h
deleted file mode 100644
index 9ce5116..0000000
--- a/libjava/java/awt/image/ImagingOpException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImagingOpException__
-#define __java_awt_image_ImagingOpException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImagingOpException;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImagingOpException : public ::java::lang::RuntimeException
-{
-
-public:
-  ImagingOpException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8026288481846276658LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImagingOpException__
diff --git a/libjava/java/awt/image/IndexColorModel.h b/libjava/java/awt/image/IndexColorModel.h
deleted file mode 100644
index a79a531..0000000
--- a/libjava/java/awt/image/IndexColorModel.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_IndexColorModel__
-#define __java_awt_image_IndexColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-      }
-    }
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class java::awt::image::IndexColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jint);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jboolean, jint, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jint, ::java::math::BigInteger *);
-  virtual jint getMapSize();
-  virtual jint getTransparentPixel();
-  virtual void getReds(JArray< jbyte > *);
-  virtual void getGreens(JArray< jbyte > *);
-  virtual void getBlues(JArray< jbyte > *);
-  virtual void getAlphas(JArray< jbyte > *);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-  virtual void getRGBs(JArray< jint > *);
-  virtual jboolean isValid(jint);
-  virtual jboolean isValid();
-  virtual ::java::math::BigInteger * getValidPixels();
-  virtual ::java::awt::image::BufferedImage * convertToIntDiscrete(::java::awt::image::Raster *, jboolean);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-private:
-  void setTransparentPixel(jint);
-  JArray< jint > * createColorMap(jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) map_size;
-  jboolean opaque;
-  jint trans;
-  JArray< jint > * rgb;
-  ::java::math::BigInteger * validBits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_IndexColorModel__
diff --git a/libjava/java/awt/image/Kernel.h b/libjava/java/awt/image/Kernel.h
deleted file mode 100644
index f0bacc1..0000000
--- a/libjava/java/awt/image/Kernel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Kernel__
-#define __java_awt_image_Kernel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class Kernel;
-      }
-    }
-  }
-}
-
-class java::awt::image::Kernel : public ::java::lang::Object
-{
-
-public:
-  Kernel(jint, jint, JArray< jfloat > *);
-  virtual jint getXOrigin();
-  virtual jint getYOrigin();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual JArray< jfloat > * getKernelData(JArray< jfloat > *);
-  virtual ::java::lang::Object * clone();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  JArray< jfloat > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Kernel__
diff --git a/libjava/java/awt/image/LookupOp.h b/libjava/java/awt/image/LookupOp.h
deleted file mode 100644
index 0754604..0000000
--- a/libjava/java/awt/image/LookupOp.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupOp__
-#define __java_awt_image_LookupOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class LookupOp;
-          class LookupTable;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupOp : public ::java::lang::Object
-{
-
-public:
-  LookupOp(::java::awt::image::LookupTable *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::image::LookupTable * getTable();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-private:
-  ::java::awt::image::LookupTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lut;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupOp__
diff --git a/libjava/java/awt/image/LookupTable.h b/libjava/java/awt/image/LookupTable.h
deleted file mode 100644
index 2fcd645..0000000
--- a/libjava/java/awt/image/LookupTable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupTable__
-#define __java_awt_image_LookupTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class LookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupTable : public ::java::lang::Object
-{
-
-public: // actually protected
-  LookupTable(jint, jint);
-public:
-  virtual jint getNumComponents();
-  virtual jint getOffset();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
-  jint numComponents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupTable__
diff --git a/libjava/java/awt/image/MemoryImageSource.h b/libjava/java/awt/image/MemoryImageSource.h
deleted file mode 100644
index e717ee8..0000000
--- a/libjava/java/awt/image/MemoryImageSource.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MemoryImageSource__
-#define __java_awt_image_MemoryImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class MemoryImageSource;
-      }
-    }
-  }
-}
-
-class java::awt::image::MemoryImageSource : public ::java::lang::Object
-{
-
-public:
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, jint, jint);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void setAnimated(jboolean);
-  virtual void setFullBufferUpdates(jboolean);
-  virtual void newPixels();
-private:
-  void sendPicture(::java::awt::image::ImageConsumer *);
-public:
-  virtual void newPixels(jint, jint, jint, jint);
-  virtual void newPixels(jint, jint, jint, jint, jboolean);
-  virtual void newPixels(JArray< jbyte > *, ::java::awt::image::ColorModel *, jint, jint);
-  virtual void newPixels(JArray< jint > *, ::java::awt::image::ColorModel *, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) animated;
-  jboolean fullbuffers;
-  JArray< jint > * pixeli;
-  jint width;
-  jint height;
-  jint offset;
-  jint scansize;
-  JArray< jbyte > * pixelb;
-  ::java::awt::image::ColorModel * cm;
-  ::java::util::Hashtable * props;
-  ::java::util::Vector * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MemoryImageSource__
diff --git a/libjava/java/awt/image/MultiPixelPackedSampleModel.h b/libjava/java/awt/image/MultiPixelPackedSampleModel.h
deleted file mode 100644
index 377ceaf..0000000
--- a/libjava/java/awt/image/MultiPixelPackedSampleModel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MultiPixelPackedSampleModel__
-#define __java_awt_image_MultiPixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class MultiPixelPackedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::MultiPixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  MultiPixelPackedSampleModel(jint, jint, jint, jint);
-  MultiPixelPackedSampleModel(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getNumDataElements();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual jint getBitOffset(jint);
-  virtual jint getDataBitOffset();
-  virtual jint getScanlineStride();
-  virtual jint getPixelBitStride();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MultiPixelPackedSampleModel__
diff --git a/libjava/java/awt/image/PackedColorModel.h b/libjava/java/awt/image/PackedColorModel.h
deleted file mode 100644
index 2d98aa9..0000000
--- a/libjava/java/awt/image/PackedColorModel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PackedColorModel__
-#define __java_awt_image_PackedColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class PackedColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::PackedColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, JArray< jint > *, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * calcBitsPerComponent(JArray< jint > *, jint);
-  void initMasks(JArray< jint > *, jint);
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * makeColorMaskArray(jint, jint, jint);
-public:
-  virtual jint getMask(jint);
-  virtual JArray< jint > * getMasks();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) masks;
-public: // actually package-private
-  JArray< jint > * shifts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PackedColorModel__
diff --git a/libjava/java/awt/image/PixelGrabber$1.h b/libjava/java/awt/image/PixelGrabber$1.h
deleted file mode 100644
index e627104..0000000
--- a/libjava/java/awt/image/PixelGrabber$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber$1__
-#define __java_awt_image_PixelGrabber$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelGrabber;
-          class PixelGrabber$1;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  PixelGrabber$1(::java::awt::image::PixelGrabber *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::java::awt::image::PixelGrabber * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber$1__
diff --git a/libjava/java/awt/image/PixelGrabber.h b/libjava/java/awt/image/PixelGrabber.h
deleted file mode 100644
index f530f34..0000000
--- a/libjava/java/awt/image/PixelGrabber.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber__
-#define __java_awt_image_PixelGrabber__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-          class PixelGrabber;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber : public ::java::lang::Object
-{
-
-public:
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::image::ImageProducer *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, jboolean);
-  virtual void startGrabbing();
-  virtual void abortGrabbing();
-  virtual jboolean grabPixels();
-  virtual jboolean grabPixels(jlong);
-private:
-  jboolean setObserverStatus();
-public:
-  virtual jint getStatus();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual ::java::lang::Object * getPixels();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-  virtual jint status();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint offset;
-  jint width;
-  jint height;
-  jint scansize;
-  jboolean forceRGB;
-  ::java::awt::image::ColorModel * model;
-  jint hints;
-  ::java::util::Hashtable * props;
-  JArray< jint > * int_pixel_buffer;
-  jboolean ints_delivered;
-  JArray< jbyte > * byte_pixel_buffer;
-  jboolean bytes_delivered;
-  ::java::awt::image::ImageProducer * ip;
-  jint observerStatus;
-  jint consumerStatus;
-private:
-  ::java::lang::Thread * grabberThread;
-public: // actually package-private
-  jboolean grabbing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber__
diff --git a/libjava/java/awt/image/PixelInterleavedSampleModel.h b/libjava/java/awt/image/PixelInterleavedSampleModel.h
deleted file mode 100644
index 42ba582..0000000
--- a/libjava/java/awt/image/PixelInterleavedSampleModel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelInterleavedSampleModel__
-#define __java_awt_image_PixelInterleavedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelInterleavedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelInterleavedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-public:
-  PixelInterleavedSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelInterleavedSampleModel__
diff --git a/libjava/java/awt/image/RGBImageFilter.h b/libjava/java/awt/image/RGBImageFilter.h
deleted file mode 100644
index 34aea65..0000000
--- a/libjava/java/awt/image/RGBImageFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RGBImageFilter__
-#define __java_awt_image_RGBImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class IndexColorModel;
-          class RGBImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::RGBImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  RGBImageFilter();
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void substituteColorModel(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::IndexColorModel * filterIndexColorModel(::java::awt::image::IndexColorModel *);
-  virtual void filterRGBPixels(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual jint filterRGB(jint, jint, jint) = 0;
-public: // actually protected
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) origmodel;
-  ::java::awt::image::ColorModel * newmodel;
-  jboolean canFilterIndexColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RGBImageFilter__
diff --git a/libjava/java/awt/image/Raster.h b/libjava/java/awt/image/Raster.h
deleted file mode 100644
index 2c187d5..0000000
--- a/libjava/java/awt/image/Raster.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Raster__
-#define __java_awt_image_Raster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::Raster : public ::java::lang::Object
-{
-
-public: // actually protected
-  Raster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::Raster *);
-public:
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::Raster * createRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  virtual ::java::awt::image::Raster * getParent();
-  virtual jint getSampleModelTranslateX();
-  virtual jint getSampleModelTranslateY();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(::java::awt::Rectangle *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::DataBuffer * getDataBuffer();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual jint getSample(jint, jint, jint);
-  virtual jfloat getSampleFloat(jint, jint, jint);
-  virtual jdouble getSampleDouble(jint, jint, jint);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  virtual ::java::lang::String * toString();
-private:
-  static jint getTypeBits(jint);
-public: // actually protected
-  ::java::awt::image::SampleModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sampleModel;
-  ::java::awt::image::DataBuffer * dataBuffer;
-  jint minX;
-  jint minY;
-  jint width;
-  jint height;
-  jint sampleModelTranslateX;
-  jint sampleModelTranslateY;
-  jint numBands;
-  jint numDataElements;
-  ::java::awt::image::Raster * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Raster__
diff --git a/libjava/java/awt/image/RasterFormatException.h b/libjava/java/awt/image/RasterFormatException.h
deleted file mode 100644
index acfe394..0000000
--- a/libjava/java/awt/image/RasterFormatException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterFormatException__
-#define __java_awt_image_RasterFormatException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RasterFormatException;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterFormatException : public ::java::lang::RuntimeException
-{
-
-public:
-  RasterFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 96598996116164315LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RasterFormatException__
diff --git a/libjava/java/awt/image/RasterOp.h b/libjava/java/awt/image/RasterOp.h
deleted file mode 100644
index a54b9b0..0000000
--- a/libjava/java/awt/image/RasterOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterOp__
-#define __java_awt_image_RasterOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class Raster;
-          class RasterOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RasterOp__
diff --git a/libjava/java/awt/image/RenderedImage.h b/libjava/java/awt/image/RenderedImage.h
deleted file mode 100644
index f47ca93..0000000
--- a/libjava/java/awt/image/RenderedImage.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RenderedImage__
-#define __java_awt_image_RenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class RenderedImage;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RenderedImage__
diff --git a/libjava/java/awt/image/ReplicateScaleFilter.h b/libjava/java/awt/image/ReplicateScaleFilter.h
deleted file mode 100644
index d518d79..0000000
--- a/libjava/java/awt/image/ReplicateScaleFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ReplicateScaleFilter__
-#define __java_awt_image_ReplicateScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ReplicateScaleFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::ReplicateScaleFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  ReplicateScaleFilter(jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  void setupSources();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) destHeight;
-  jint destWidth;
-  jint srcHeight;
-  jint srcWidth;
-  JArray< jint > * srcrows;
-  JArray< jint > * srccols;
-  ::java::lang::Object * outpixbuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ReplicateScaleFilter__
diff --git a/libjava/java/awt/image/RescaleOp.h b/libjava/java/awt/image/RescaleOp.h
deleted file mode 100644
index ba67ec9..0000000
--- a/libjava/java/awt/image/RescaleOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RescaleOp__
-#define __java_awt_image_RescaleOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class RescaleOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RescaleOp : public ::java::lang::Object
-{
-
-public:
-  RescaleOp(JArray< jfloat > *, JArray< jfloat > *, ::java::awt::RenderingHints *);
-  RescaleOp(jfloat, jfloat, ::java::awt::RenderingHints *);
-  virtual JArray< jfloat > * getScaleFactors(JArray< jfloat > *);
-  virtual JArray< jfloat > * getOffsets(JArray< jfloat > *);
-  virtual jint getNumFactors();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jboolean > *);
-public:
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scale;
-  JArray< jfloat > * offsets;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RescaleOp__
diff --git a/libjava/java/awt/image/SampleModel.h b/libjava/java/awt/image/SampleModel.h
deleted file mode 100644
index 5d51a65..0000000
--- a/libjava/java/awt/image/SampleModel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SampleModel__
-#define __java_awt_image_SampleModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SampleModel : public ::java::lang::Object
-{
-
-public:
-  SampleModel(jint, jint, jint, jint);
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements() = 0;
-  virtual jint getDataType();
-  virtual jint getTransferType();
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint) = 0;
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *) = 0;
-  virtual ::java::awt::image::DataBuffer * createDataBuffer() = 0;
-  virtual JArray< jint > * getSampleSize() = 0;
-  virtual jint getSampleSize(jint) = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  jint numBands;
-  jint dataType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SampleModel__
diff --git a/libjava/java/awt/image/ShortLookupTable.h b/libjava/java/awt/image/ShortLookupTable.h
deleted file mode 100644
index 053331b..0000000
--- a/libjava/java/awt/image/ShortLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ShortLookupTable__
-#define __java_awt_image_ShortLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ShortLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ShortLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ShortLookupTable(jint, JArray< JArray< jshort > * > *);
-  ShortLookupTable(jint, JArray< jshort > *);
-  virtual JArray< JArray< jshort > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jshort > * lookupPixel(JArray< jshort > *, JArray< jshort > *);
-private:
-  JArray< JArray< jshort > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ShortLookupTable__
diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.h b/libjava/java/awt/image/SinglePixelPackedSampleModel.h
deleted file mode 100644
index c7bf07c..0000000
--- a/libjava/java/awt/image/SinglePixelPackedSampleModel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SinglePixelPackedSampleModel__
-#define __java_awt_image_SinglePixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-          class SinglePixelPackedSampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SinglePixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  SinglePixelPackedSampleModel(jint, jint, jint, JArray< jint > *);
-  SinglePixelPackedSampleModel(jint, jint, jint, jint, JArray< jint > *);
-  virtual jint getNumDataElements();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual JArray< jint > * getBitOffsets();
-  virtual JArray< jint > * getBitMasks();
-  virtual jint getScanlineStride();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SinglePixelPackedSampleModel__
diff --git a/libjava/java/awt/image/TileObserver.h b/libjava/java/awt/image/TileObserver.h
deleted file mode 100644
index 9f7d0a1..0000000
--- a/libjava/java/awt/image/TileObserver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_TileObserver__
-#define __java_awt_image_TileObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class TileObserver;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::TileObserver : public ::java::lang::Object
-{
-
-public:
-  virtual void tileUpdate(::java::awt::image::WritableRenderedImage *, jint, jint, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_TileObserver__
diff --git a/libjava/java/awt/image/VolatileImage.h b/libjava/java/awt/image/VolatileImage.h
deleted file mode 100644
index ed28928..0000000
--- a/libjava/java/awt/image/VolatileImage.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_VolatileImage__
-#define __java_awt_image_VolatileImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ImageProducer;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::VolatileImage : public ::java::awt::Image
-{
-
-public:
-  VolatileImage();
-  virtual ::java::awt::image::BufferedImage * getSnapshot() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Graphics2D * createGraphics() = 0;
-  virtual jint validate(::java::awt::GraphicsConfiguration *) = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual ::java::awt::ImageCapabilities * getCapabilities() = 0;
-  virtual jint getTransparency();
-  static const jint IMAGE_OK = 0;
-  static const jint IMAGE_RESTORED = 1;
-  static const jint IMAGE_INCOMPATIBLE = 2;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) transparency;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_VolatileImage__
diff --git a/libjava/java/awt/image/WritableRaster.h b/libjava/java/awt/image/WritableRaster.h
deleted file mode 100644
index 5db229c..0000000
--- a/libjava/java/awt/image/WritableRaster.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRaster__
-#define __java_awt_image_WritableRaster__
-
-#pragma interface
-
-#include <java/awt/image/Raster.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRaster : public ::java::awt::image::Raster
-{
-
-public: // actually protected
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::WritableRaster *);
-public:
-  virtual ::java::awt::image::WritableRaster * getWritableParent();
-  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *);
-  virtual void setDataElements(jint, jint, ::java::awt::image::Raster *);
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual void setRect(::java::awt::image::Raster *);
-  virtual void setRect(jint, jint, ::java::awt::image::Raster *);
-  virtual void setPixel(jint, jint, JArray< jint > *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual void setSample(jint, jint, jint, jint);
-  virtual void setSample(jint, jint, jint, jfloat);
-  virtual void setSample(jint, jint, jint, jdouble);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_WritableRaster__
diff --git a/libjava/java/awt/image/WritableRenderedImage.h b/libjava/java/awt/image/WritableRenderedImage.h
deleted file mode 100644
index f9b2481..0000000
--- a/libjava/java/awt/image/WritableRenderedImage.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRenderedImage__
-#define __java_awt_image_WritableRenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual void addTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual void removeTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint) = 0;
-  virtual void releaseWritableTile(jint, jint) = 0;
-  virtual jboolean isTileWritable(jint, jint) = 0;
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices() = 0;
-  virtual jboolean hasTileWriters() = 0;
-  virtual void setData(::java::awt::image::Raster *) = 0;
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_WritableRenderedImage__
diff --git a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h b/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
deleted file mode 100644
index d7ac129..0000000
--- a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ContextualRenderedImageFactory__
-#define __java_awt_image_renderable_ContextualRenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ContextualRenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::renderable::RenderContext * mapRenderContext(jint, ::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *, ::java::awt::image::renderable::RenderableImage *) = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::awt::image::renderable::ParameterBlock *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_ContextualRenderedImageFactory__
diff --git a/libjava/java/awt/image/renderable/ParameterBlock.h b/libjava/java/awt/image/renderable/ParameterBlock.h
deleted file mode 100644
index cafafbd..0000000
--- a/libjava/java/awt/image/renderable/ParameterBlock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ParameterBlock__
-#define __java_awt_image_renderable_ParameterBlock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ParameterBlock : public ::java::lang::Object
-{
-
-public:
-  ParameterBlock();
-  ParameterBlock(::java::util::Vector *);
-  ParameterBlock(::java::util::Vector *, ::java::util::Vector *);
-  virtual ::java::lang::Object * shallowClone();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::renderable::ParameterBlock * addSource(::java::lang::Object *);
-  virtual ::java::lang::Object * getSource(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * setSource(::java::lang::Object *, jint);
-  virtual ::java::awt::image::RenderedImage * getRenderedSource(jint);
-  virtual ::java::awt::image::renderable::RenderableImage * getRenderableSource(jint);
-  virtual jint getNumSources();
-  virtual ::java::util::Vector * getSources();
-  virtual void setSources(::java::util::Vector *);
-  virtual void removeSources();
-  virtual jint getNumParameters();
-  virtual ::java::util::Vector * getParameters();
-  virtual void setParameters(::java::util::Vector *);
-  virtual void removeParameters();
-  virtual ::java::awt::image::renderable::ParameterBlock * add(::java::lang::Object *);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jbyte);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jchar);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jshort);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jlong);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jfloat);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jdouble);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(::java::lang::Object *, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jbyte, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jchar, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jshort, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jint, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jlong, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jfloat, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jdouble, jint);
-  virtual ::java::lang::Object * getObjectParameter(jint);
-  virtual jbyte getByteParameter(jint);
-  virtual jchar getCharParameter(jint);
-  virtual jshort getShortParameter(jint);
-  virtual jint getIntParameter(jint);
-  virtual jlong getLongParameter(jint);
-  virtual jfloat getFloatParameter(jint);
-  virtual jdouble getDoubleParameter(jint);
-  virtual JArray< ::java::lang::Class * > * getParamClasses();
-private:
-  static const jlong serialVersionUID = -7577115551785240750LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sources;
-  ::java::util::Vector * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_ParameterBlock__
diff --git a/libjava/java/awt/image/renderable/RenderContext.h b/libjava/java/awt/image/renderable/RenderContext.h
deleted file mode 100644
index 4923ebc..0000000
--- a/libjava/java/awt/image/renderable/RenderContext.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderContext__
-#define __java_awt_image_renderable_RenderContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-        namespace renderable
-        {
-            class RenderContext;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderContext : public ::java::lang::Object
-{
-
-public:
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void setRenderingHints(::java::awt::RenderingHints *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setAreaOfInterest(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getAreaOfInterest();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xform;
-  ::java::awt::Shape * aoi;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderContext__
diff --git a/libjava/java/awt/image/renderable/RenderableImage.h b/libjava/java/awt/image/renderable/RenderableImage.h
deleted file mode 100644
index c7fed51..0000000
--- a/libjava/java/awt/image/renderable/RenderableImage.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImage__
-#define __java_awt_image_renderable_RenderableImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual jfloat getWidth() = 0;
-  virtual jfloat getHeight() = 0;
-  virtual jfloat getMinX() = 0;
-  virtual jfloat getMinY() = 0;
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *) = 0;
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering() = 0;
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *) = 0;
-  static ::java::lang::String * HINTS_OBSERVED;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderableImage__
diff --git a/libjava/java/awt/image/renderable/RenderableImageOp.h b/libjava/java/awt/image/renderable/RenderableImageOp.h
deleted file mode 100644
index edc766d..0000000
--- a/libjava/java/awt/image/renderable/RenderableImageOp.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageOp__
-#define __java_awt_image_renderable_RenderableImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImageOp;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageOp : public ::java::lang::Object
-{
-
-public:
-  RenderableImageOp(::java::awt::image::renderable::ContextualRenderedImageFactory *, ::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jboolean isDynamic();
-  virtual jfloat getWidth();
-  virtual jfloat getHeight();
-  virtual jfloat getMinX();
-  virtual jfloat getMinY();
-  virtual ::java::awt::image::renderable::ParameterBlock * setParameterBlock(::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::awt::image::renderable::ParameterBlock * getParameterBlock();
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering();
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *);
-private:
-  ::java::awt::image::renderable::ContextualRenderedImageFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) crif;
-  ::java::awt::image::renderable::ParameterBlock * block;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageOp__
diff --git a/libjava/java/awt/image/renderable/RenderableImageProducer.h b/libjava/java/awt/image/renderable/RenderableImageProducer.h
deleted file mode 100644
index 4e1968f..0000000
--- a/libjava/java/awt/image/renderable/RenderableImageProducer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageProducer__
-#define __java_awt_image_renderable_RenderableImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-            class RenderableImageProducer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageProducer : public ::java::lang::Object
-{
-
-public:
-  RenderableImageProducer(::java::awt::image::renderable::RenderableImage *, ::java::awt::image::renderable::RenderContext *);
-  virtual void setRenderContext(::java::awt::image::renderable::RenderContext *);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void run();
-private:
-  ::java::awt::image::renderable::RenderableImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::renderable::RenderContext * context;
-  ::java::util::ArrayList * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageProducer__
diff --git a/libjava/java/awt/image/renderable/RenderedImageFactory.h b/libjava/java/awt/image/renderable/RenderedImageFactory.h
deleted file mode 100644
index 3e2eb93499..0000000
--- a/libjava/java/awt/image/renderable/RenderedImageFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderedImageFactory__
-#define __java_awt_image_renderable_RenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderedImageFactory;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderedImageFactory__