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

144 files changed, 0 insertions, 6606 deletions

diff --git a/libjava/javax/print/AttributeException.h b/libjava/javax/print/AttributeException.h
deleted file mode 100644
index 2402a17..0000000
--- a/libjava/javax/print/AttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_AttributeException__
-#define __javax_print_AttributeException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class AttributeException;
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::AttributeException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Class * > * getUnsupportedAttributes() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * getUnsupportedValues() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_AttributeException__
diff --git a/libjava/javax/print/CancelablePrintJob.h b/libjava/javax/print/CancelablePrintJob.h
deleted file mode 100644
index 31b006e..0000000
--- a/libjava/javax/print/CancelablePrintJob.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_CancelablePrintJob__
-#define __javax_print_CancelablePrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class CancelablePrintJob;
-        class Doc;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::CancelablePrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void cancel() = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_CancelablePrintJob__
diff --git a/libjava/javax/print/Doc.h b/libjava/javax/print/Doc.h
deleted file mode 100644
index 6b3bc34..0000000
--- a/libjava/javax/print/Doc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_Doc__
-#define __javax_print_Doc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocFlavor;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::Doc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::attribute::DocAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::DocFlavor * getDocFlavor() = 0;
-  virtual ::java::lang::Object * getPrintData() = 0;
-  virtual ::java::io::Reader * getReaderForText() = 0;
-  virtual ::java::io::InputStream * getStreamForBytes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_Doc__
diff --git a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h b/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
deleted file mode 100644
index 006ddb0..0000000
--- a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$BYTE_ARRAY__
-#define __javax_print_DocFlavor$BYTE_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$BYTE_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$BYTE_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$BYTE_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9065578006593857475LL;
-public:
-  static ::javax::print::DocFlavor$BYTE_ARRAY * AUTOSENSE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * GIF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * JPEG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PCL;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PDF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PNG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * POSTSCRIPT;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$BYTE_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h b/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
deleted file mode 100644
index 1909d2e..0000000
--- a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$CHAR_ARRAY__
-#define __javax_print_DocFlavor$CHAR_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$CHAR_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$CHAR_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$CHAR_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8720590903724405128LL;
-public:
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_HTML;
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$CHAR_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$INPUT_STREAM.h b/libjava/javax/print/DocFlavor$INPUT_STREAM.h
deleted file mode 100644
index 3c635de..0000000
--- a/libjava/javax/print/DocFlavor$INPUT_STREAM.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$INPUT_STREAM__
-#define __javax_print_DocFlavor$INPUT_STREAM__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$INPUT_STREAM;
-    }
-  }
-}
-
-class javax::print::DocFlavor$INPUT_STREAM : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$INPUT_STREAM(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7045842700749194127LL;
-public:
-  static ::javax::print::DocFlavor$INPUT_STREAM * AUTOSENSE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * GIF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * JPEG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PCL;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PDF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PNG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * POSTSCRIPT;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$INPUT_STREAM__
diff --git a/libjava/javax/print/DocFlavor$READER.h b/libjava/javax/print/DocFlavor$READER.h
deleted file mode 100644
index c6a24cd..0000000
--- a/libjava/javax/print/DocFlavor$READER.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$READER__
-#define __javax_print_DocFlavor$READER__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$READER;
-    }
-  }
-}
-
-class javax::print::DocFlavor$READER : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$READER(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7100295812579351567LL;
-public:
-  static ::javax::print::DocFlavor$READER * TEXT_HTML;
-  static ::javax::print::DocFlavor$READER * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$READER__
diff --git a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h b/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
deleted file mode 100644
index 85386b1..0000000
--- a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$SERVICE_FORMATTED__
-#define __javax_print_DocFlavor$SERVICE_FORMATTED__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$SERVICE_FORMATTED;
-    }
-  }
-}
-
-class javax::print::DocFlavor$SERVICE_FORMATTED : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$SERVICE_FORMATTED(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6181337766266637256LL;
-public:
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PAGEABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PRINTABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * RENDERABLE_IMAGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$SERVICE_FORMATTED__
diff --git a/libjava/javax/print/DocFlavor$STRING.h b/libjava/javax/print/DocFlavor$STRING.h
deleted file mode 100644
index c1ef38b..0000000
--- a/libjava/javax/print/DocFlavor$STRING.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$STRING__
-#define __javax_print_DocFlavor$STRING__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$STRING;
-    }
-  }
-}
-
-class javax::print::DocFlavor$STRING : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$STRING(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4414407504887034035LL;
-public:
-  static ::javax::print::DocFlavor$STRING * TEXT_HTML;
-  static ::javax::print::DocFlavor$STRING * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$STRING__
diff --git a/libjava/javax/print/DocFlavor$URL.h b/libjava/javax/print/DocFlavor$URL.h
deleted file mode 100644
index 82bc856..0000000
--- a/libjava/javax/print/DocFlavor$URL.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$URL__
-#define __javax_print_DocFlavor$URL__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$URL;
-    }
-  }
-}
-
-class javax::print::DocFlavor$URL : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$URL(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2936725788144902062LL;
-public:
-  static ::javax::print::DocFlavor$URL * AUTOSENSE;
-  static ::javax::print::DocFlavor$URL * GIF;
-  static ::javax::print::DocFlavor$URL * JPEG;
-  static ::javax::print::DocFlavor$URL * PCL;
-  static ::javax::print::DocFlavor$URL * PDF;
-  static ::javax::print::DocFlavor$URL * PNG;
-  static ::javax::print::DocFlavor$URL * POSTSCRIPT;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$URL__
diff --git a/libjava/javax/print/DocFlavor.h b/libjava/javax/print/DocFlavor.h
deleted file mode 100644
index f533198..0000000
--- a/libjava/javax/print/DocFlavor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor__
-#define __javax_print_DocFlavor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-    }
-  }
-}
-
-class javax::print::DocFlavor : public ::java::lang::Object
-{
-
-public:
-  DocFlavor(::java::lang::String *, ::java::lang::String *);
-private:
-  void parseMimeType(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getMediaSubtype();
-  virtual ::java::lang::String * getMediaType();
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::lang::String * getRepresentationClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -4512080796965449721LL;
-public:
-  static ::java::lang::String * hostEncoding;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mediaSubtype;
-  ::java::lang::String * mediaType;
-  ::java::util::TreeMap * params;
-  ::java::lang::String * myClassName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor__
diff --git a/libjava/javax/print/DocPrintJob.h b/libjava/javax/print/DocPrintJob.h
deleted file mode 100644
index 3a450e1..0000000
--- a/libjava/javax/print/DocPrintJob.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocPrintJob__
-#define __javax_print_DocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::DocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_DocPrintJob__
diff --git a/libjava/javax/print/FlavorException.h b/libjava/javax/print/FlavorException.h
deleted file mode 100644
index b06cdd6..0000000
--- a/libjava/javax/print/FlavorException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_FlavorException__
-#define __javax_print_FlavorException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class FlavorException;
-    }
-  }
-}
-
-class javax::print::FlavorException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::print::DocFlavor * > * getUnsupportedFlavors() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_FlavorException__
diff --git a/libjava/javax/print/MultiDoc.h b/libjava/javax/print/MultiDoc.h
deleted file mode 100644
index 8148c7e..0000000
--- a/libjava/javax/print/MultiDoc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDoc__
-#define __javax_print_MultiDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-    }
-  }
-}
-
-class javax::print::MultiDoc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::Doc * getDoc() = 0;
-  virtual ::javax::print::MultiDoc * next() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDoc__
diff --git a/libjava/javax/print/MultiDocPrintJob.h b/libjava/javax/print/MultiDocPrintJob.h
deleted file mode 100644
index 4c14d64..0000000
--- a/libjava/javax/print/MultiDocPrintJob.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintJob__
-#define __javax_print_MultiDocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-        class MultiDocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void print(::javax::print::MultiDoc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintJob__
diff --git a/libjava/javax/print/MultiDocPrintService.h b/libjava/javax/print/MultiDocPrintService.h
deleted file mode 100644
index 0b613f6..0000000
--- a/libjava/javax/print/MultiDocPrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintService__
-#define __javax_print_MultiDocPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class MultiDocPrintJob;
-        class MultiDocPrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::MultiDocPrintJob * createMultiDocPrintJob() = 0;
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintService__
diff --git a/libjava/javax/print/PrintException.h b/libjava/javax/print/PrintException.h
deleted file mode 100644
index 90a1659..0000000
--- a/libjava/javax/print/PrintException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintException__
-#define __javax_print_PrintException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintException;
-    }
-  }
-}
-
-class javax::print::PrintException : public ::java::lang::Exception
-{
-
-public:
-  PrintException();
-  PrintException(::java::lang::Exception *);
-  PrintException(::java::lang::String *);
-  PrintException(::java::lang::String *, ::java::lang::Exception *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintException__
diff --git a/libjava/javax/print/PrintService.h b/libjava/javax/print/PrintService.h
deleted file mode 100644
index 3e26159..0000000
--- a/libjava/javax/print/PrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintService__
-#define __javax_print_PrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class PrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::PrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_PrintService__
diff --git a/libjava/javax/print/PrintServiceLookup.h b/libjava/javax/print/PrintServiceLookup.h
deleted file mode 100644
index 5409da9..0000000
--- a/libjava/javax/print/PrintServiceLookup.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintServiceLookup__
-#define __javax_print_PrintServiceLookup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsPrintServiceLookup;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class MultiDocPrintService;
-        class PrintService;
-        class PrintServiceLookup;
-      namespace attribute
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::PrintServiceLookup : public ::java::lang::Object
-{
-
-public:
-  PrintServiceLookup();
-  static jboolean registerServiceProvider(::javax::print::PrintServiceLookup *);
-  static jboolean registerService(::javax::print::PrintService *);
-  static JArray< ::javax::print::PrintService * > * lookupPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  static JArray< ::javax::print::MultiDocPrintService * > * lookupMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *);
-  static ::javax::print::PrintService * lookupDefaultPrintService();
-  virtual ::javax::print::PrintService * getDefaultPrintService() = 0;
-  virtual JArray< ::javax::print::MultiDocPrintService * > * getMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices() = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-private:
-  static ::gnu::javax::print::CupsPrintServiceLookup * systemProvider;
-  static ::java::util::HashSet * printServices;
-  static ::java::util::HashSet * printServiceLookups;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintServiceLookup__
diff --git a/libjava/javax/print/ServiceUI.h b/libjava/javax/print/ServiceUI.h
deleted file mode 100644
index 8ec373a..0000000
--- a/libjava/javax/print/ServiceUI.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUI__
-#define __javax_print_ServiceUI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class PrintService;
-        class ServiceUI;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::ServiceUI : public ::java::lang::Object
-{
-
-public:
-  ServiceUI();
-  static ::javax::print::PrintService * printDialog(::java::awt::GraphicsConfiguration *, jint, jint, JArray< ::javax::print::PrintService * > *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUI__
diff --git a/libjava/javax/print/ServiceUIFactory.h b/libjava/javax/print/ServiceUIFactory.h
deleted file mode 100644
index 2424058..0000000
--- a/libjava/javax/print/ServiceUIFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUIFactory__
-#define __javax_print_ServiceUIFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class ServiceUIFactory;
-    }
-  }
-}
-
-class javax::print::ServiceUIFactory : public ::java::lang::Object
-{
-
-public:
-  ServiceUIFactory();
-  virtual ::java::lang::Object * getUI(jint, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getUIClassNamesForRole(jint) = 0;
-  static const jint ABOUT_UIROLE = 1;
-  static const jint ADMIN_UIROLE = 2;
-  static const jint MAIN_UIROLE = 3;
-  static const jint RESERVED_UIROLE = 99;
-  static ::java::lang::String * DIALOG_UI;
-  static ::java::lang::String * JCOMPONENT_UI;
-  static ::java::lang::String * JDIALOG_UI;
-  static ::java::lang::String * PANEL_UI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUIFactory__
diff --git a/libjava/javax/print/SimpleDoc.h b/libjava/javax/print/SimpleDoc.h
deleted file mode 100644
index b055e4e..0000000
--- a/libjava/javax/print/SimpleDoc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_SimpleDoc__
-#define __javax_print_SimpleDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class SimpleDoc;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::SimpleDoc : public ::java::lang::Object
-{
-
-public:
-  SimpleDoc(::java::lang::Object *, ::javax::print::DocFlavor *, ::javax::print::attribute::DocAttributeSet *);
-  ::javax::print::attribute::DocAttributeSet * getAttributes();
-  ::javax::print::DocFlavor * getDocFlavor();
-  ::java::lang::Object * getPrintData();
-  ::java::io::Reader * getReaderForText();
-  ::java::io::InputStream * getStreamForBytes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printData;
-  ::javax::print::DocFlavor * flavor;
-  ::javax::print::attribute::DocAttributeSet * attributes;
-  ::java::io::InputStream * stream;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_SimpleDoc__
diff --git a/libjava/javax/print/StreamPrintService.h b/libjava/javax/print/StreamPrintService.h
deleted file mode 100644
index 115d6ef..0000000
--- a/libjava/javax/print/StreamPrintService.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintService__
-#define __javax_print_StreamPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class ServiceUIFactory;
-        class StreamPrintService;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::StreamPrintService : public ::java::lang::Object
-{
-
-public: // actually protected
-  StreamPrintService(::java::io::OutputStream *);
-public:
-  virtual void dispose();
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual jboolean isDisposed();
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) disposed;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintService__
diff --git a/libjava/javax/print/StreamPrintServiceFactory.h b/libjava/javax/print/StreamPrintServiceFactory.h
deleted file mode 100644
index 496b51f..0000000
--- a/libjava/javax/print/StreamPrintServiceFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintServiceFactory__
-#define __javax_print_StreamPrintServiceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class StreamPrintService;
-        class StreamPrintServiceFactory;
-    }
-  }
-}
-
-class javax::print::StreamPrintServiceFactory : public ::java::lang::Object
-{
-
-public:
-  StreamPrintServiceFactory();
-  static JArray< ::javax::print::StreamPrintServiceFactory * > * lookupStreamPrintServiceFactories(::javax::print::DocFlavor *, ::java::lang::String *);
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::StreamPrintService * getPrintService(::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintServiceFactory__
diff --git a/libjava/javax/print/URIException.h b/libjava/javax/print/URIException.h
deleted file mode 100644
index 7e4f868..0000000
--- a/libjava/javax/print/URIException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_URIException__
-#define __javax_print_URIException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class URIException;
-    }
-  }
-}
-
-class javax::print::URIException : public ::java::lang::Object
-{
-
-public:
-  virtual jint getReason() = 0;
-  virtual ::java::net::URI * getUnsupportedURI() = 0;
-  static const jint URIInaccessible = 1;
-  static const jint URIOtherProblem = -1;
-  static const jint URISchemeNotSupported = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_URIException__
diff --git a/libjava/javax/print/attribute/Attribute.h b/libjava/javax/print/attribute/Attribute.h
deleted file mode 100644
index 88c4efd..0000000
--- a/libjava/javax/print/attribute/Attribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Attribute__
-#define __javax_print_attribute_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_Attribute__
diff --git a/libjava/javax/print/attribute/AttributeSet.h b/libjava/javax/print/attribute/AttributeSet.h
deleted file mode 100644
index f1fed93..0000000
--- a/libjava/javax/print/attribute/AttributeSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSet__
-#define __javax_print_attribute_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_AttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
deleted file mode 100644
index 34cee3d..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$SynchronizedAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$SynchronizedAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
deleted file mode 100644
index 1e2b9a4..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
deleted file mode 100644
index c52b551..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
deleted file mode 100644
index 4fbb3d9..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
deleted file mode 100644
index 8177161..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
deleted file mode 100644
index 71de416..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$UnmodifiableAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
deleted file mode 100644
index de2bb98..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiableDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
deleted file mode 100644
index 6f800a2..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
deleted file mode 100644
index 6dea83b..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
deleted file mode 100644
index edfe069..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities.h b/libjava/javax/print/attribute/AttributeSetUtilities.h
deleted file mode 100644
index 85f90d0..0000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities__
-#define __javax_print_attribute_AttributeSetUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities;
-          class DocAttributeSet;
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities : public ::java::lang::Object
-{
-
-  AttributeSetUtilities();
-public:
-  static ::javax::print::attribute::AttributeSet * synchronizedView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * synchronizedView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * synchronizedView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * synchronizedView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * synchronizedView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::javax::print::attribute::AttributeSet * unmodifiableView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * unmodifiableView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * unmodifiableView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * unmodifiableView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * unmodifiableView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class * verifyAttributeCategory(::java::lang::Object *, ::java::lang::Class *);
-  static ::javax::print::attribute::Attribute * verifyAttributeValue(::java::lang::Object *, ::java::lang::Class *);
-  static void verifyCategoryForValue(::java::lang::Class *, ::javax::print::attribute::Attribute *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities__
diff --git a/libjava/javax/print/attribute/DateTimeSyntax.h b/libjava/javax/print/attribute/DateTimeSyntax.h
deleted file mode 100644
index 8ec4f3c..0000000
--- a/libjava/javax/print/attribute/DateTimeSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DateTimeSyntax__
-#define __javax_print_attribute_DateTimeSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DateTimeSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DateTimeSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  DateTimeSyntax(::java::util::Date *);
-public:
-  virtual ::java::util::Date * getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1400819079791208582LL;
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_DateTimeSyntax__
diff --git a/libjava/javax/print/attribute/DocAttribute.h b/libjava/javax/print/attribute/DocAttribute.h
deleted file mode 100644
index d26bc6d..0000000
--- a/libjava/javax/print/attribute/DocAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttribute__
-#define __javax_print_attribute_DocAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttribute__
diff --git a/libjava/javax/print/attribute/DocAttributeSet.h b/libjava/javax/print/attribute/DocAttributeSet.h
deleted file mode 100644
index c85d799..0000000
--- a/libjava/javax/print/attribute/DocAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttributeSet__
-#define __javax_print_attribute_DocAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttributeSet__
diff --git a/libjava/javax/print/attribute/EnumSyntax.h b/libjava/javax/print/attribute/EnumSyntax.h
deleted file mode 100644
index 5b445c3..0000000
--- a/libjava/javax/print/attribute/EnumSyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_EnumSyntax__
-#define __javax_print_attribute_EnumSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::EnumSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  EnumSyntax(jint);
-public:
-  virtual jint getValue();
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual ::java::lang::Object * readResolve();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -2739521845085831642LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_EnumSyntax__
diff --git a/libjava/javax/print/attribute/HashAttributeSet.h b/libjava/javax/print/attribute/HashAttributeSet.h
deleted file mode 100644
index b82db6e..0000000
--- a/libjava/javax/print/attribute/HashAttributeSet.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashAttributeSet__
-#define __javax_print_attribute_HashAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class HashAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashAttributeSet : public ::java::lang::Object
-{
-
-public:
-  HashAttributeSet();
-  HashAttributeSet(::javax::print::attribute::Attribute *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *);
-public: // actually protected
-  HashAttributeSet(::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *, ::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-private:
-  jboolean addInternal(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-public:
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-private:
-  jboolean addAllInternal(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 5311560590283707917LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) myInterface;
-  ::java::util::HashMap * attributeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashAttributeSet__
diff --git a/libjava/javax/print/attribute/HashDocAttributeSet.h b/libjava/javax/print/attribute/HashDocAttributeSet.h
deleted file mode 100644
index 43b9eaec..0000000
--- a/libjava/javax/print/attribute/HashDocAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashDocAttributeSet__
-#define __javax_print_attribute_HashDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-          class DocAttributeSet;
-          class HashDocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashDocAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashDocAttributeSet();
-  HashDocAttributeSet(::javax::print::attribute::DocAttribute *);
-  HashDocAttributeSet(JArray< ::javax::print::attribute::DocAttribute * > *);
-  HashDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-private:
-  static const jlong serialVersionUID = -1128534486061432528LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashDocAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h b/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
deleted file mode 100644
index 26fde6f..0000000
--- a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintJobAttributeSet__
-#define __javax_print_attribute_HashPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintJobAttributeSet;
-          class PrintJobAttribute;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintJobAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintJobAttributeSet();
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttribute *);
-  HashPrintJobAttributeSet(JArray< ::javax::print::attribute::PrintJobAttribute * > *);
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-private:
-  static const jlong serialVersionUID = -4204473656070350348LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h b/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
deleted file mode 100644
index a1232a2..0000000
--- a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintRequestAttributeSet__
-#define __javax_print_attribute_HashPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintRequestAttributeSet;
-          class PrintRequestAttribute;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintRequestAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintRequestAttributeSet();
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttribute *);
-  HashPrintRequestAttributeSet(JArray< ::javax::print::attribute::PrintRequestAttribute * > *);
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-private:
-  static const jlong serialVersionUID = 2364756266107751933LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h b/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
deleted file mode 100644
index abf583a..0000000
--- a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintServiceAttributeSet__
-#define __javax_print_attribute_HashPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintServiceAttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintServiceAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintServiceAttributeSet();
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttribute *);
-  HashPrintServiceAttributeSet(JArray< ::javax::print::attribute::PrintServiceAttribute * > *);
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-private:
-  static const jlong serialVersionUID = 6642904616179203070LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/IntegerSyntax.h b/libjava/javax/print/attribute/IntegerSyntax.h
deleted file mode 100644
index 63ac7e0..0000000
--- a/libjava/javax/print/attribute/IntegerSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_IntegerSyntax__
-#define __javax_print_attribute_IntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::IntegerSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  IntegerSyntax(jint);
-  IntegerSyntax(jint, jint, jint);
-public:
-  virtual jint getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_IntegerSyntax__
diff --git a/libjava/javax/print/attribute/PrintJobAttribute.h b/libjava/javax/print/attribute/PrintJobAttribute.h
deleted file mode 100644
index c22e5d7..0000000
--- a/libjava/javax/print/attribute/PrintJobAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttribute__
-#define __javax_print_attribute_PrintJobAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintJobAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttribute__
diff --git a/libjava/javax/print/attribute/PrintJobAttributeSet.h b/libjava/javax/print/attribute/PrintJobAttributeSet.h
deleted file mode 100644
index 713ad66..0000000
--- a/libjava/javax/print/attribute/PrintJobAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttributeSet__
-#define __javax_print_attribute_PrintJobAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintRequestAttribute.h b/libjava/javax/print/attribute/PrintRequestAttribute.h
deleted file mode 100644
index 7d95bfc..0000000
--- a/libjava/javax/print/attribute/PrintRequestAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttribute__
-#define __javax_print_attribute_PrintRequestAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintRequestAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttribute__
diff --git a/libjava/javax/print/attribute/PrintRequestAttributeSet.h b/libjava/javax/print/attribute/PrintRequestAttributeSet.h
deleted file mode 100644
index 9929176..0000000
--- a/libjava/javax/print/attribute/PrintRequestAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttributeSet__
-#define __javax_print_attribute_PrintRequestAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintServiceAttribute.h b/libjava/javax/print/attribute/PrintServiceAttribute.h
deleted file mode 100644
index eae0864..0000000
--- a/libjava/javax/print/attribute/PrintServiceAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttribute__
-#define __javax_print_attribute_PrintServiceAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintServiceAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttribute__
diff --git a/libjava/javax/print/attribute/PrintServiceAttributeSet.h b/libjava/javax/print/attribute/PrintServiceAttributeSet.h
deleted file mode 100644
index 73db991..0000000
--- a/libjava/javax/print/attribute/PrintServiceAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttributeSet__
-#define __javax_print_attribute_PrintServiceAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/ResolutionSyntax.h b/libjava/javax/print/attribute/ResolutionSyntax.h
deleted file mode 100644
index 107642d..0000000
--- a/libjava/javax/print/attribute/ResolutionSyntax.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_ResolutionSyntax__
-#define __javax_print_attribute_ResolutionSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class ResolutionSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::ResolutionSyntax : public ::java::lang::Object
-{
-
-public:
-  ResolutionSyntax(jint, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getCrossFeedResolution(jint);
-public: // actually protected
-  virtual jint getCrossFeedResolutionDphi();
-public:
-  virtual jint getFeedResolution(jint);
-public: // actually protected
-  virtual jint getFeedResolutionDphi();
-public:
-  virtual JArray< jint > * getResolution(jint);
-  virtual jint hashCode();
-  virtual jboolean lessThanOrEquals(::javax::print::attribute::ResolutionSyntax *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2706743076526672017LL;
-public:
-  static const jint DPCM = 254;
-  static const jint DPI = 100;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) crossFeedResolution;
-  jint feedResolution;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_ResolutionSyntax__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h b/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
deleted file mode 100644
index 0caee53..0000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax$1__
-#define __javax_print_attribute_SetOfIntegerSyntax$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SetOfIntegerSyntax$1;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SetOfIntegerSyntax$1();
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax$1__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax.h b/libjava/javax/print/attribute/SetOfIntegerSyntax.h
deleted file mode 100644
index 302544f..0000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax__
-#define __javax_print_attribute_SetOfIntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class StringCharacterIterator;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-          class SetOfIntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax : public ::java::lang::Object
-{
-
-  static JArray< JArray< jint > * > * normalize(JArray< JArray< jint > * > *, jint);
-public: // actually protected
-  SetOfIntegerSyntax(jint);
-  SetOfIntegerSyntax(JArray< JArray< jint > * > *);
-private:
-  jboolean skipWhitespace(::java::text::StringCharacterIterator *);
-  jboolean skipNumber(::java::text::StringCharacterIterator *);
-public: // actually protected
-  SetOfIntegerSyntax(::java::lang::String *);
-  SetOfIntegerSyntax(jint, jint);
-public:
-  virtual jboolean contains(jint);
-  virtual jboolean contains(::javax::print::attribute::IntegerSyntax *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< JArray< jint > * > * getMembers();
-  virtual jint hashCode();
-  virtual jint next(jint);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3666874174847632203LL;
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) members;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax__
diff --git a/libjava/javax/print/attribute/Size2DSyntax.h b/libjava/javax/print/attribute/Size2DSyntax.h
deleted file mode 100644
index 36280a5..0000000
--- a/libjava/javax/print/attribute/Size2DSyntax.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Size2DSyntax__
-#define __javax_print_attribute_Size2DSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Size2DSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Size2DSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  Size2DSyntax(jfloat, jfloat, jint);
-  Size2DSyntax(jint, jint, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< jfloat > * getSize(jint);
-  virtual jfloat getX(jint);
-public: // actually protected
-  virtual jint getXMicrometers();
-public:
-  virtual jfloat getY(jint);
-public: // actually protected
-  virtual jint getYMicrometers();
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_Size2DSyntax__
diff --git a/libjava/javax/print/attribute/SupportedValuesAttribute.h b/libjava/javax/print/attribute/SupportedValuesAttribute.h
deleted file mode 100644
index 26b2b2b..0000000
--- a/libjava/javax/print/attribute/SupportedValuesAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SupportedValuesAttribute__
-#define __javax_print_attribute_SupportedValuesAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SupportedValuesAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SupportedValuesAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_SupportedValuesAttribute__
diff --git a/libjava/javax/print/attribute/TextSyntax.h b/libjava/javax/print/attribute/TextSyntax.h
deleted file mode 100644
index b22700d..0000000
--- a/libjava/javax/print/attribute/TextSyntax.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_TextSyntax__
-#define __javax_print_attribute_TextSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class TextSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::TextSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  TextSyntax(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * getValue();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8130648736378144102LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::java::util::Locale * locale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_TextSyntax__
diff --git a/libjava/javax/print/attribute/URISyntax.h b/libjava/javax/print/attribute/URISyntax.h
deleted file mode 100644
index 9c38d5c..0000000
--- a/libjava/javax/print/attribute/URISyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_URISyntax__
-#define __javax_print_attribute_URISyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class URISyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::URISyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  URISyntax(::java::net::URI *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::URI * getURI();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7842661210486401678LL;
-  ::java::net::URI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_URISyntax__
diff --git a/libjava/javax/print/attribute/UnmodifiableSetException.h b/libjava/javax/print/attribute/UnmodifiableSetException.h
deleted file mode 100644
index 33bc128..0000000
--- a/libjava/javax/print/attribute/UnmodifiableSetException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_UnmodifiableSetException__
-#define __javax_print_attribute_UnmodifiableSetException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class UnmodifiableSetException;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::UnmodifiableSetException : public ::java::lang::RuntimeException
-{
-
-public:
-  UnmodifiableSetException();
-  UnmodifiableSetException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_UnmodifiableSetException__
diff --git a/libjava/javax/print/attribute/standard/Chromaticity.h b/libjava/javax/print/attribute/standard/Chromaticity.h
deleted file mode 100644
index 9571ef8..0000000
--- a/libjava/javax/print/attribute/standard/Chromaticity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Chromaticity__
-#define __javax_print_attribute_standard_Chromaticity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Chromaticity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Chromaticity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Chromaticity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4660543931355214012LL;
-public:
-  static ::javax::print::attribute::standard::Chromaticity * MONOCHROME;
-  static ::javax::print::attribute::standard::Chromaticity * COLOR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Chromaticity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Chromaticity__
diff --git a/libjava/javax/print/attribute/standard/ColorSupported.h b/libjava/javax/print/attribute/standard/ColorSupported.h
deleted file mode 100644
index 085c0cd..0000000
--- a/libjava/javax/print/attribute/standard/ColorSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ColorSupported__
-#define __javax_print_attribute_standard_ColorSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ColorSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ColorSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ColorSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -2700555589688535545LL;
-public:
-  static ::javax::print::attribute::standard::ColorSupported * NOT_SUPPORTED;
-  static ::javax::print::attribute::standard::ColorSupported * SUPPORTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ColorSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ColorSupported__
diff --git a/libjava/javax/print/attribute/standard/Compression.h b/libjava/javax/print/attribute/standard/Compression.h
deleted file mode 100644
index f1dc555..0000000
--- a/libjava/javax/print/attribute/standard/Compression.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Compression__
-#define __javax_print_attribute_standard_Compression__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Compression;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Compression : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Compression(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -5716748913324997674LL;
-public:
-  static ::javax::print::attribute::standard::Compression * NONE;
-  static ::javax::print::attribute::standard::Compression * DEFLATE;
-  static ::javax::print::attribute::standard::Compression * GZIP;
-  static ::javax::print::attribute::standard::Compression * COMPRESS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Compression * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Compression__
diff --git a/libjava/javax/print/attribute/standard/Copies.h b/libjava/javax/print/attribute/standard/Copies.h
deleted file mode 100644
index d2c277c..0000000
--- a/libjava/javax/print/attribute/standard/Copies.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Copies__
-#define __javax_print_attribute_standard_Copies__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Copies;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Copies : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  Copies(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6426631521680023833LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Copies__
diff --git a/libjava/javax/print/attribute/standard/CopiesSupported.h b/libjava/javax/print/attribute/standard/CopiesSupported.h
deleted file mode 100644
index 62c3428..0000000
--- a/libjava/javax/print/attribute/standard/CopiesSupported.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_CopiesSupported__
-#define __javax_print_attribute_standard_CopiesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class CopiesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::CopiesSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  CopiesSupported(jint);
-  CopiesSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6927711687034846001LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_CopiesSupported__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h b/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
deleted file mode 100644
index 1b012a3..0000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCompleted__
-#define __javax_print_attribute_standard_DateTimeAtCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCompleted : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCompleted(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6497399708058490000LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCompleted__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h b/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
deleted file mode 100644
index a88c7c1..0000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCreation__
-#define __javax_print_attribute_standard_DateTimeAtCreation__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCreation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCreation : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCreation(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2923732231056647903LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCreation__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h b/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
deleted file mode 100644
index 8f50d1b..0000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtProcessing__
-#define __javax_print_attribute_standard_DateTimeAtProcessing__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtProcessing;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtProcessing : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtProcessing(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3710068197278263244LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtProcessing__
diff --git a/libjava/javax/print/attribute/standard/Destination.h b/libjava/javax/print/attribute/standard/Destination.h
deleted file mode 100644
index b9d5d99..0000000
--- a/libjava/javax/print/attribute/standard/Destination.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Destination__
-#define __javax_print_attribute_standard_Destination__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Destination;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Destination : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  Destination(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6776739171700415321LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Destination__
diff --git a/libjava/javax/print/attribute/standard/DocumentName.h b/libjava/javax/print/attribute/standard/DocumentName.h
deleted file mode 100644
index 6ed7121..0000000
--- a/libjava/javax/print/attribute/standard/DocumentName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DocumentName__
-#define __javax_print_attribute_standard_DocumentName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DocumentName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DocumentName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7883105848533280430LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DocumentName__
diff --git a/libjava/javax/print/attribute/standard/Fidelity.h b/libjava/javax/print/attribute/standard/Fidelity.h
deleted file mode 100644
index ac31da5..0000000
--- a/libjava/javax/print/attribute/standard/Fidelity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Fidelity__
-#define __javax_print_attribute_standard_Fidelity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Fidelity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Fidelity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Fidelity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 6320827847329172308LL;
-public:
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_TRUE;
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_FALSE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Fidelity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Fidelity__
diff --git a/libjava/javax/print/attribute/standard/Finishings.h b/libjava/javax/print/attribute/standard/Finishings.h
deleted file mode 100644
index 6b228c8..0000000
--- a/libjava/javax/print/attribute/standard/Finishings.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Finishings__
-#define __javax_print_attribute_standard_Finishings__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Finishings;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Finishings : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Finishings(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -627840419548391754LL;
-public:
-  static ::javax::print::attribute::standard::Finishings * NONE;
-  static ::javax::print::attribute::standard::Finishings * STAPLE;
-  static ::javax::print::attribute::standard::Finishings * COVER;
-  static ::javax::print::attribute::standard::Finishings * BIND;
-  static ::javax::print::attribute::standard::Finishings * SADDLE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_LEFT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_TOP;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_BOTTOM;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_TOP;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_BOTTOM;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Finishings * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Finishings__
diff --git a/libjava/javax/print/attribute/standard/JobHoldUntil.h b/libjava/javax/print/attribute/standard/JobHoldUntil.h
deleted file mode 100644
index c13c5273..0000000
--- a/libjava/javax/print/attribute/standard/JobHoldUntil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobHoldUntil__
-#define __javax_print_attribute_standard_JobHoldUntil__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobHoldUntil;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobHoldUntil : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  JobHoldUntil(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1664471048860415024LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobHoldUntil__
diff --git a/libjava/javax/print/attribute/standard/JobImpressions.h b/libjava/javax/print/attribute/standard/JobImpressions.h
deleted file mode 100644
index 0cf0006..0000000
--- a/libjava/javax/print/attribute/standard/JobImpressions.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressions__
-#define __javax_print_attribute_standard_JobImpressions__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressions;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressions : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressions(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8225537206784322464LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressions__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h b/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
deleted file mode 100644
index 37deda5..0000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsCompleted__
-#define __javax_print_attribute_standard_JobImpressionsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressionsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6722648442432393294LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h b/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
deleted file mode 100644
index 83f5c1b..0000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsSupported__
-#define __javax_print_attribute_standard_JobImpressionsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobImpressionsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4887354803843173692LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobKOctets.h b/libjava/javax/print/attribute/standard/JobKOctets.h
deleted file mode 100644
index 35241fc1..0000000
--- a/libjava/javax/print/attribute/standard/JobKOctets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctets__
-#define __javax_print_attribute_standard_JobKOctets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctets(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8959710146498202869LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctets__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
deleted file mode 100644
index 8eb274b..0000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsProcessed__
-#define __javax_print_attribute_standard_JobKOctetsProcessed__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsProcessed;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsProcessed : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctetsProcessed(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6265238509657881806LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsProcessed__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h b/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
deleted file mode 100644
index 455211e..0000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsSupported__
-#define __javax_print_attribute_standard_JobKOctetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobKOctetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2867871140549897443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheets.h b/libjava/javax/print/attribute/standard/JobMediaSheets.h
deleted file mode 100644
index 4f21d41..0000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheets__
-#define __javax_print_attribute_standard_JobMediaSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheets(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 408871131531979741LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheets__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
deleted file mode 100644
index e12bf25..0000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsCompleted__
-#define __javax_print_attribute_standard_JobMediaSheetsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheetsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1739595973810840475LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h b/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
deleted file mode 100644
index b451ce4..0000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsSupported__
-#define __javax_print_attribute_standard_JobMediaSheetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobMediaSheetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2953685470388672940LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h b/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
deleted file mode 100644
index 4c43f0d..0000000
--- a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMessageFromOperator__
-#define __javax_print_attribute_standard_JobMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4620751846003142047LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/JobName.h b/libjava/javax/print/attribute/standard/JobName.h
deleted file mode 100644
index 4147be4..0000000
--- a/libjava/javax/print/attribute/standard/JobName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobName__
-#define __javax_print_attribute_standard_JobName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4660359192078689545LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobName__
diff --git a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h b/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
deleted file mode 100644
index a3ba067..0000000
--- a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobOriginatingUserName__
-#define __javax_print_attribute_standard_JobOriginatingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobOriginatingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobOriginatingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobOriginatingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8052537926362933477LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobOriginatingUserName__
diff --git a/libjava/javax/print/attribute/standard/JobPriority.h b/libjava/javax/print/attribute/standard/JobPriority.h
deleted file mode 100644
index 54a4622..0000000
--- a/libjava/javax/print/attribute/standard/JobPriority.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPriority__
-#define __javax_print_attribute_standard_JobPriority__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPriority;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPriority : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPriority(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4599900369040602769LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPriority__
diff --git a/libjava/javax/print/attribute/standard/JobPrioritySupported.h b/libjava/javax/print/attribute/standard/JobPrioritySupported.h
deleted file mode 100644
index c131fe7..0000000
--- a/libjava/javax/print/attribute/standard/JobPrioritySupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPrioritySupported__
-#define __javax_print_attribute_standard_JobPrioritySupported__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPrioritySupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPrioritySupported : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPrioritySupported(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2564840378013555894LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPrioritySupported__
diff --git a/libjava/javax/print/attribute/standard/JobSheets.h b/libjava/javax/print/attribute/standard/JobSheets.h
deleted file mode 100644
index 8ab9c7f..0000000
--- a/libjava/javax/print/attribute/standard/JobSheets.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobSheets__
-#define __javax_print_attribute_standard_JobSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobSheets : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobSheets(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -4735258056132519759LL;
-public:
-  static ::javax::print::attribute::standard::JobSheets * NONE;
-  static ::javax::print::attribute::standard::JobSheets * STANDARD;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobSheets * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobSheets__
diff --git a/libjava/javax/print/attribute/standard/JobState.h b/libjava/javax/print/attribute/standard/JobState.h
deleted file mode 100644
index dc6c1ec..0000000
--- a/libjava/javax/print/attribute/standard/JobState.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobState__
-#define __javax_print_attribute_standard_JobState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobState(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 400465010094018920LL;
-public:
-  static ::javax::print::attribute::standard::JobState * UNKNOWN;
-  static ::javax::print::attribute::standard::JobState * PENDING;
-  static ::javax::print::attribute::standard::JobState * PENDING_HELD;
-  static ::javax::print::attribute::standard::JobState * PROCESSING;
-  static ::javax::print::attribute::standard::JobState * PROCESSING_STOPPED;
-  static ::javax::print::attribute::standard::JobState * CANCELED;
-  static ::javax::print::attribute::standard::JobState * ABORTED;
-  static ::javax::print::attribute::standard::JobState * COMPLETED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobState__
diff --git a/libjava/javax/print/attribute/standard/JobStateReason.h b/libjava/javax/print/attribute/standard/JobStateReason.h
deleted file mode 100644
index b641ef6..0000000
--- a/libjava/javax/print/attribute/standard/JobStateReason.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReason__
-#define __javax_print_attribute_standard_JobStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobStateReason(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -8765894420449009168LL;
-public:
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INCOMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_DATA_INSUFFICIENT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_ACCESS_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * SUBMISSION_INTERRUPTED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_OUTGOING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_HOLD_UNTIL_SPECIFIED;
-  static ::javax::print::attribute::standard::JobStateReason * RESOURCES_ARE_NOT_READY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INTERPRETING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_TRANSFORMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED_FOR_MARKER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_PRINTING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_USER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_OPERATOR;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_AT_DEVICE;
-  static ::javax::print::attribute::standard::JobStateReason * ABORTED_BY_SYSTEM;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_COMPRESSION;
-  static ::javax::print::attribute::standard::JobStateReason * COMPRESSION_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_DOCUMENT_FORMAT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_FORMAT_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * PROCESSING_TO_STOP_POINT;
-  static ::javax::print::attribute::standard::JobStateReason * SERVICE_OFF_LINE;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_SUCCESSFULLY;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_WARNINGS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_ERRORS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_RESTARTABLE;
-  static ::javax::print::attribute::standard::JobStateReason * QUEUED_IN_DEVICE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReason__
diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.h b/libjava/javax/print/attribute/standard/JobStateReasons.h
deleted file mode 100644
index e02a3e7..0000000
--- a/libjava/javax/print/attribute/standard/JobStateReasons.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReasons__
-#define __javax_print_attribute_standard_JobStateReasons__
-
-#pragma interface
-
-#include <java/util/HashSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobStateReason;
-            class JobStateReasons;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReasons : public ::java::util::HashSet
-{
-
-public:
-  JobStateReasons();
-  JobStateReasons(jint, jfloat);
-  JobStateReasons(jint);
-  JobStateReasons(::java::util::Collection *);
-  jboolean JobStateReasons$add(::javax::print::attribute::standard::JobStateReason *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jboolean add(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 8849088261264331812LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReasons__
diff --git a/libjava/javax/print/attribute/standard/Media.h b/libjava/javax/print/attribute/standard/Media.h
deleted file mode 100644
index e4c013b..0000000
--- a/libjava/javax/print/attribute/standard/Media.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Media__
-#define __javax_print_attribute_standard_Media__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Media;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Media : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Media(jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2823970704630722439LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Media__
diff --git a/libjava/javax/print/attribute/standard/MediaName.h b/libjava/javax/print/attribute/standard/MediaName.h
deleted file mode 100644
index 160d6bb..0000000
--- a/libjava/javax/print/attribute/standard/MediaName.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaName__
-#define __javax_print_attribute_standard_MediaName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4653117714524155448LL;
-public:
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_WHITE;
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_TRANSPARENT;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_WHITE;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_TRANSPARENT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaName__
diff --git a/libjava/javax/print/attribute/standard/MediaPrintableArea.h b/libjava/javax/print/attribute/standard/MediaPrintableArea.h
deleted file mode 100644
index 89c9610..0000000
--- a/libjava/javax/print/attribute/standard/MediaPrintableArea.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaPrintableArea__
-#define __javax_print_attribute_standard_MediaPrintableArea__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaPrintableArea;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaPrintableArea : public ::java::lang::Object
-{
-
-public:
-  MediaPrintableArea(jfloat, jfloat, jfloat, jfloat, jint);
-  MediaPrintableArea(jint, jint, jint, jint, jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jfloat getHeight(jint);
-  jfloat getWidth(jint);
-  jfloat getX(jint);
-  jfloat getY(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  jint hashCode();
-  ::java::lang::String * toString(jint, ::java::lang::String *);
-  JArray< jfloat > * getPrintableArea(jint);
-private:
-  static const jlong serialVersionUID = -1597171464050795793LL;
-public:
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint w;
-  jint h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaPrintableArea__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h b/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
deleted file mode 100644
index ae8edcc..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Engineering__
-#define __javax_print_attribute_standard_MediaSize$Engineering__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Engineering;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Engineering : public ::java::lang::Object
-{
-
-  MediaSize$Engineering();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A;
-  static ::javax::print::attribute::standard::MediaSize * B;
-  static ::javax::print::attribute::standard::MediaSize * C;
-  static ::javax::print::attribute::standard::MediaSize * D;
-  static ::javax::print::attribute::standard::MediaSize * E;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Engineering__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$ISO.h b/libjava/javax/print/attribute/standard/MediaSize$ISO.h
deleted file mode 100644
index 0865646..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize$ISO.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$ISO__
-#define __javax_print_attribute_standard_MediaSize$ISO__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$ISO;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$ISO : public ::java::lang::Object
-{
-
-  MediaSize$ISO();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A0;
-  static ::javax::print::attribute::standard::MediaSize * A1;
-  static ::javax::print::attribute::standard::MediaSize * A2;
-  static ::javax::print::attribute::standard::MediaSize * A3;
-  static ::javax::print::attribute::standard::MediaSize * A4;
-  static ::javax::print::attribute::standard::MediaSize * A5;
-  static ::javax::print::attribute::standard::MediaSize * A6;
-  static ::javax::print::attribute::standard::MediaSize * A7;
-  static ::javax::print::attribute::standard::MediaSize * A8;
-  static ::javax::print::attribute::standard::MediaSize * A9;
-  static ::javax::print::attribute::standard::MediaSize * A10;
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * C3;
-  static ::javax::print::attribute::standard::MediaSize * C4;
-  static ::javax::print::attribute::standard::MediaSize * C5;
-  static ::javax::print::attribute::standard::MediaSize * C6;
-  static ::javax::print::attribute::standard::MediaSize * DESIGNATED_LONG;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$ISO__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$JIS.h b/libjava/javax/print/attribute/standard/MediaSize$JIS.h
deleted file mode 100644
index be15457..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize$JIS.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$JIS__
-#define __javax_print_attribute_standard_MediaSize$JIS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$JIS;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$JIS : public ::java::lang::Object
-{
-
-  MediaSize$JIS();
-public:
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_1;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_2;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_3;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_4;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_30;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_40;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_0;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_1;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_2;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_20;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_3;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_4;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_5;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_6;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_7;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_8;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_A4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_1;
-  static ::javax::print::attribute::standard::MediaSize * YOU_2;
-  static ::javax::print::attribute::standard::MediaSize * YOU_3;
-  static ::javax::print::attribute::standard::MediaSize * YOU_4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_5;
-  static ::javax::print::attribute::standard::MediaSize * YOU_6;
-  static ::javax::print::attribute::standard::MediaSize * YOU_7;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$JIS__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$NA.h b/libjava/javax/print/attribute/standard/MediaSize$NA.h
deleted file mode 100644
index e0236bf..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize$NA.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$NA__
-#define __javax_print_attribute_standard_MediaSize$NA__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$NA;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$NA : public ::java::lang::Object
-{
-
-  MediaSize$NA();
-public:
-  static ::javax::print::attribute::standard::MediaSize * LEGAL;
-  static ::javax::print::attribute::standard::MediaSize * LETTER;
-  static ::javax::print::attribute::standard::MediaSize * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSize * NA_8X10;
-  static ::javax::print::attribute::standard::MediaSize * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_14_ENVELOPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$NA__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Other.h b/libjava/javax/print/attribute/standard/MediaSize$Other.h
deleted file mode 100644
index d95078f..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Other.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Other__
-#define __javax_print_attribute_standard_MediaSize$Other__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Other;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Other : public ::java::lang::Object
-{
-
-  MediaSize$Other();
-public:
-  static ::javax::print::attribute::standard::MediaSize * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSize * FOLIO;
-  static ::javax::print::attribute::standard::MediaSize * QUARTO;
-  static ::javax::print::attribute::standard::MediaSize * INVOICE;
-  static ::javax::print::attribute::standard::MediaSize * LEDGER;
-  static ::javax::print::attribute::standard::MediaSize * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * TABLOID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Other__
diff --git a/libjava/javax/print/attribute/standard/MediaSize.h b/libjava/javax/print/attribute/standard/MediaSize.h
deleted file mode 100644
index 3dd5aa9..0000000
--- a/libjava/javax/print/attribute/standard/MediaSize.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize__
-#define __javax_print_attribute_standard_MediaSize__
-
-#pragma interface
-
-#include <javax/print/attribute/Size2DSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize : public ::javax::print::attribute::Size2DSyntax
-{
-
-public:
-  MediaSize(jfloat, jfloat, jint);
-  MediaSize(jfloat, jfloat, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  MediaSize(jint, jint, jint);
-  MediaSize(jint, jint, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  virtual ::java::lang::Class * getCategory();
-  static ::javax::print::attribute::standard::MediaSizeName * findMedia(jfloat, jfloat, jint);
-  static ::javax::print::attribute::standard::MediaSize * getMediaSizeForName(::javax::print::attribute::standard::MediaSizeName *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::standard::MediaSizeName * getMediaSizeName();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1967958664615414771LL;
-  static ::java::util::ArrayList * mediaCache;
-  ::javax::print::attribute::standard::MediaSizeName * __attribute__((aligned(__alignof__( ::javax::print::attribute::Size2DSyntax)))) mediaName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize__
diff --git a/libjava/javax/print/attribute/standard/MediaSizeName.h b/libjava/javax/print/attribute/standard/MediaSizeName.h
deleted file mode 100644
index fecbee6..0000000
--- a/libjava/javax/print/attribute/standard/MediaSizeName.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSizeName__
-#define __javax_print_attribute_standard_MediaSizeName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSizeName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaSizeName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 2778798329756942747LL;
-public:
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C6;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LETTER;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LEGAL;
-  static ::javax::print::attribute::standard::MediaSizeName * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSizeName * LEDGER;
-  static ::javax::print::attribute::standard::MediaSizeName * TABLOID;
-  static ::javax::print::attribute::standard::MediaSizeName * INVOICE;
-  static ::javax::print::attribute::standard::MediaSizeName * FOLIO;
-  static ::javax::print::attribute::standard::MediaSizeName * QUARTO;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * A;
-  static ::javax::print::attribute::standard::MediaSizeName * B;
-  static ::javax::print::attribute::standard::MediaSizeName * C;
-  static ::javax::print::attribute::standard::MediaSizeName * D;
-  static ::javax::print::attribute::standard::MediaSizeName * E;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_DESIGNATED_LONG;
-  static ::javax::print::attribute::standard::MediaSizeName * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_8X10;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaSizeName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSizeName__
diff --git a/libjava/javax/print/attribute/standard/MediaTray.h b/libjava/javax/print/attribute/standard/MediaTray.h
deleted file mode 100644
index 05fe123..0000000
--- a/libjava/javax/print/attribute/standard/MediaTray.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaTray__
-#define __javax_print_attribute_standard_MediaTray__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaTray;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaTray : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaTray(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -982503611095214703LL;
-public:
-  static ::javax::print::attribute::standard::MediaTray * TOP;
-  static ::javax::print::attribute::standard::MediaTray * MIDDLE;
-  static ::javax::print::attribute::standard::MediaTray * BOTTOM;
-  static ::javax::print::attribute::standard::MediaTray * ENVELOPE;
-  static ::javax::print::attribute::standard::MediaTray * MANUAL;
-  static ::javax::print::attribute::standard::MediaTray * LARGE_CAPACITY;
-  static ::javax::print::attribute::standard::MediaTray * MAIN;
-  static ::javax::print::attribute::standard::MediaTray * SIDE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaTray * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaTray__
diff --git a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h b/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
deleted file mode 100644
index 2748996..0000000
--- a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MultipleDocumentHandling__
-#define __javax_print_attribute_standard_MultipleDocumentHandling__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MultipleDocumentHandling;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MultipleDocumentHandling : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentHandling(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8098326460746413466LL;
-public:
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT_NEW_SHEET;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MultipleDocumentHandling * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MultipleDocumentHandling__
diff --git a/libjava/javax/print/attribute/standard/NumberOfDocuments.h b/libjava/javax/print/attribute/standard/NumberOfDocuments.h
deleted file mode 100644
index 58eae0b..0000000
--- a/libjava/javax/print/attribute/standard/NumberOfDocuments.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfDocuments__
-#define __javax_print_attribute_standard_NumberOfDocuments__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfDocuments;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfDocuments : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfDocuments(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7891881310684461097LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfDocuments__
diff --git a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h b/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
deleted file mode 100644
index cdca469..0000000
--- a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfInterveningJobs__
-#define __javax_print_attribute_standard_NumberOfInterveningJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfInterveningJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfInterveningJobs : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfInterveningJobs(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2568141124844982746LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfInterveningJobs__
diff --git a/libjava/javax/print/attribute/standard/NumberUp.h b/libjava/javax/print/attribute/standard/NumberUp.h
deleted file mode 100644
index dfa108f..0000000
--- a/libjava/javax/print/attribute/standard/NumberUp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUp__
-#define __javax_print_attribute_standard_NumberUp__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUp;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUp : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberUp(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3040436486786527811LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUp__
diff --git a/libjava/javax/print/attribute/standard/NumberUpSupported.h b/libjava/javax/print/attribute/standard/NumberUpSupported.h
deleted file mode 100644
index aff84dd..0000000
--- a/libjava/javax/print/attribute/standard/NumberUpSupported.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUpSupported__
-#define __javax_print_attribute_standard_NumberUpSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUpSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUpSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  NumberUpSupported(jint);
-  NumberUpSupported(JArray< JArray< jint > * > *);
-  NumberUpSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1041573395759141805LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUpSupported__
diff --git a/libjava/javax/print/attribute/standard/OrientationRequested.h b/libjava/javax/print/attribute/standard/OrientationRequested.h
deleted file mode 100644
index 28e0fc1..0000000
--- a/libjava/javax/print/attribute/standard/OrientationRequested.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OrientationRequested__
-#define __javax_print_attribute_standard_OrientationRequested__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class OrientationRequested;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OrientationRequested : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OrientationRequested(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-private:
-  static const jlong serialVersionUID = -4447437289862822276LL;
-public:
-  static ::javax::print::attribute::standard::OrientationRequested * PORTRAIT;
-  static ::javax::print::attribute::standard::OrientationRequested * LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_PORTRAIT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::OrientationRequested * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OrientationRequested__
diff --git a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
deleted file mode 100644
index de03f87..0000000
--- a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OutputDeviceAssigned__
-#define __javax_print_attribute_standard_OutputDeviceAssigned__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class OutputDeviceAssigned;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OutputDeviceAssigned : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  OutputDeviceAssigned(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 5486733778854271081LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OutputDeviceAssigned__
diff --git a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h b/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
deleted file mode 100644
index 525b878..0000000
--- a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PDLOverrideSupported__
-#define __javax_print_attribute_standard_PDLOverrideSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PDLOverrideSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PDLOverrideSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PDLOverrideSupported(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -4393264467928463934LL;
-public:
-  static ::javax::print::attribute::standard::PDLOverrideSupported * NOT_ATTEMPTED;
-  static ::javax::print::attribute::standard::PDLOverrideSupported * ATTEMPTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PDLOverrideSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PDLOverrideSupported__
diff --git a/libjava/javax/print/attribute/standard/PageRanges.h b/libjava/javax/print/attribute/standard/PageRanges.h
deleted file mode 100644
index 1155530..0000000
--- a/libjava/javax/print/attribute/standard/PageRanges.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PageRanges__
-#define __javax_print_attribute_standard_PageRanges__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PageRanges;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PageRanges : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  PageRanges(jint);
-  PageRanges(JArray< JArray< jint > * > *);
-  PageRanges(jint, jint);
-  PageRanges(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8639895197656148392LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PageRanges__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinute.h b/libjava/javax/print/attribute/standard/PagesPerMinute.h
deleted file mode 100644
index c237fe9..0000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinute.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinute__
-#define __javax_print_attribute_standard_PagesPerMinute__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinute;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinute : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinute(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6366403993072862015LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinute__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h b/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
deleted file mode 100644
index fad634a..0000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinuteColor__
-#define __javax_print_attribute_standard_PagesPerMinuteColor__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinuteColor;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinuteColor : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinuteColor(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1684993151687470944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinuteColor__
diff --git a/libjava/javax/print/attribute/standard/PresentationDirection.h b/libjava/javax/print/attribute/standard/PresentationDirection.h
deleted file mode 100644
index cae0242..0000000
--- a/libjava/javax/print/attribute/standard/PresentationDirection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PresentationDirection__
-#define __javax_print_attribute_standard_PresentationDirection__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PresentationDirection;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PresentationDirection : public ::javax::print::attribute::EnumSyntax
-{
-
-  PresentationDirection(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8294728067230931780LL;
-public:
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOTOP;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOTOP;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PresentationDirection * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PresentationDirection__
diff --git a/libjava/javax/print/attribute/standard/PrintQuality.h b/libjava/javax/print/attribute/standard/PrintQuality.h
deleted file mode 100644
index 6c696d6..0000000
--- a/libjava/javax/print/attribute/standard/PrintQuality.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrintQuality__
-#define __javax_print_attribute_standard_PrintQuality__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrintQuality;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrintQuality : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrintQuality(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -3072341285225858365LL;
-public:
-  static ::javax::print::attribute::standard::PrintQuality * DRAFT;
-  static ::javax::print::attribute::standard::PrintQuality * NORMAL;
-  static ::javax::print::attribute::standard::PrintQuality * HIGH;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrintQuality * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrintQuality__
diff --git a/libjava/javax/print/attribute/standard/PrinterInfo.h b/libjava/javax/print/attribute/standard/PrinterInfo.h
deleted file mode 100644
index 8f9f828..0000000
--- a/libjava/javax/print/attribute/standard/PrinterInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterInfo__
-#define __javax_print_attribute_standard_PrinterInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterInfo : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterInfo(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7765280618777599727LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h b/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
deleted file mode 100644
index 2b8fdbf..0000000
--- a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-#define __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterIsAcceptingJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterIsAcceptingJobs : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterIsAcceptingJobs(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -5052010680537678061LL;
-public:
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * NOT_ACCEPTING_JOBS;
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * ACCEPTING_JOBS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterIsAcceptingJobs * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterIsAcceptingJobs__
diff --git a/libjava/javax/print/attribute/standard/PrinterLocation.h b/libjava/javax/print/attribute/standard/PrinterLocation.h
deleted file mode 100644
index 8839a09..0000000
--- a/libjava/javax/print/attribute/standard/PrinterLocation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterLocation__
-#define __javax_print_attribute_standard_PrinterLocation__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterLocation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterLocation : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterLocation(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1598610039865566337LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterLocation__
diff --git a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
deleted file mode 100644
index a121d9d..0000000
--- a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMakeAndModel__
-#define __javax_print_attribute_standard_PrinterMakeAndModel__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMakeAndModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMakeAndModel : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMakeAndModel(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4580461489499351411LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMakeAndModel__
diff --git a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h b/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
deleted file mode 100644
index 1028729..0000000
--- a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMessageFromOperator__
-#define __javax_print_attribute_standard_PrinterMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4486871203218629318LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h b/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
deleted file mode 100644
index 3a979cf..0000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfo__
-#define __javax_print_attribute_standard_PrinterMoreInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfo : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfo(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4555850007675338574LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h b/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
deleted file mode 100644
index bd7c297..0000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-#define __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfoManufacturer;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfoManufacturer : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfoManufacturer(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 3323271346485076608LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
diff --git a/libjava/javax/print/attribute/standard/PrinterName.h b/libjava/javax/print/attribute/standard/PrinterName.h
deleted file mode 100644
index fd70e82..0000000
--- a/libjava/javax/print/attribute/standard/PrinterName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterName__
-#define __javax_print_attribute_standard_PrinterName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 299740639137803127LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterName__
diff --git a/libjava/javax/print/attribute/standard/PrinterResolution.h b/libjava/javax/print/attribute/standard/PrinterResolution.h
deleted file mode 100644
index a0a5b49..0000000
--- a/libjava/javax/print/attribute/standard/PrinterResolution.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterResolution__
-#define __javax_print_attribute_standard_PrinterResolution__
-
-#pragma interface
-
-#include <javax/print/attribute/ResolutionSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterResolution;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterResolution : public ::javax::print::attribute::ResolutionSyntax
-{
-
-public:
-  PrinterResolution(jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 13090306561090558LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterResolution__
diff --git a/libjava/javax/print/attribute/standard/PrinterState.h b/libjava/javax/print/attribute/standard/PrinterState.h
deleted file mode 100644
index 7efde73..0000000
--- a/libjava/javax/print/attribute/standard/PrinterState.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterState__
-#define __javax_print_attribute_standard_PrinterState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterState(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -649578618346507718LL;
-public:
-  static ::javax::print::attribute::standard::PrinterState * UNKNOWN;
-  static ::javax::print::attribute::standard::PrinterState * IDLE;
-  static ::javax::print::attribute::standard::PrinterState * PROCESSING;
-  static ::javax::print::attribute::standard::PrinterState * STOPPED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterState__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReason.h b/libjava/javax/print/attribute/standard/PrinterStateReason.h
deleted file mode 100644
index 04b8335..0000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReason.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReason__
-#define __javax_print_attribute_standard_PrinterStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterStateReason(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -1623720656201472593LL;
-public:
-  static ::javax::print::attribute::standard::PrinterStateReason * OTHER;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_NEEDED;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_JAM;
-  static ::javax::print::attribute::standard::PrinterStateReason * MOVING_TO_PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * SHUTDOWN;
-  static ::javax::print::attribute::standard::PrinterStateReason * CONNECTING_TO_DEVICE;
-  static ::javax::print::attribute::standard::PrinterStateReason * TIMED_OUT;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPING;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * SPOOL_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * COVER_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERLOCK_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * DOOR_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_OVER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_UNDER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_NEAR_EOL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_LIFE_OVER;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERPRETER_RESOURCE_UNAVAILABLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReason__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.h b/libjava/javax/print/attribute/standard/PrinterStateReasons.h
deleted file mode 100644
index fc3d703..0000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReasons.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReasons__
-#define __javax_print_attribute_standard_PrinterStateReasons__
-
-#pragma interface
-
-#include <java/util/HashMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterStateReason;
-            class PrinterStateReasons;
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReasons : public ::java::util::HashMap
-{
-
-public:
-  PrinterStateReasons();
-  PrinterStateReasons(jint, jfloat);
-  PrinterStateReasons(jint);
-  PrinterStateReasons(::java::util::Map *);
-  ::java::util::Set * printerStateReasonSet(::javax::print::attribute::standard::Severity *);
-  ::javax::print::attribute::standard::Severity * PrinterStateReasons$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -3731791085163619457LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReasons__
diff --git a/libjava/javax/print/attribute/standard/PrinterURI.h b/libjava/javax/print/attribute/standard/PrinterURI.h
deleted file mode 100644
index b5dc5c2..0000000
--- a/libjava/javax/print/attribute/standard/PrinterURI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterURI__
-#define __javax_print_attribute_standard_PrinterURI__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterURI;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterURI : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterURI(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7923912792485606497LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterURI__
diff --git a/libjava/javax/print/attribute/standard/QueuedJobCount.h b/libjava/javax/print/attribute/standard/QueuedJobCount.h
deleted file mode 100644
index d1b1154..0000000
--- a/libjava/javax/print/attribute/standard/QueuedJobCount.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_QueuedJobCount__
-#define __javax_print_attribute_standard_QueuedJobCount__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class QueuedJobCount;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::QueuedJobCount : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  QueuedJobCount(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7499723077864047742LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_QueuedJobCount__
diff --git a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h b/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
deleted file mode 100644
index c0cdd67..0000000
--- a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-#define __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ReferenceUriSchemesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ReferenceUriSchemesSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ReferenceUriSchemesSupported(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -8989076942813442805LL;
-public:
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTPS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * GOPHER;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NEWS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NNTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * WAIS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FILE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ReferenceUriSchemesSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ReferenceUriSchemesSupported__
diff --git a/libjava/javax/print/attribute/standard/RequestingUserName.h b/libjava/javax/print/attribute/standard/RequestingUserName.h
deleted file mode 100644
index f562e26..0000000
--- a/libjava/javax/print/attribute/standard/RequestingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_RequestingUserName__
-#define __javax_print_attribute_standard_RequestingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class RequestingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::RequestingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  RequestingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2683049894310331454LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_RequestingUserName__
diff --git a/libjava/javax/print/attribute/standard/Severity.h b/libjava/javax/print/attribute/standard/Severity.h
deleted file mode 100644
index ea30253..0000000
--- a/libjava/javax/print/attribute/standard/Severity.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Severity__
-#define __javax_print_attribute_standard_Severity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Severity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Severity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8781881462717925380LL;
-public:
-  static ::javax::print::attribute::standard::Severity * REPORT;
-  static ::javax::print::attribute::standard::Severity * WARNING;
-  static ::javax::print::attribute::standard::Severity * ERROR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Severity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Severity__
diff --git a/libjava/javax/print/attribute/standard/SheetCollate.h b/libjava/javax/print/attribute/standard/SheetCollate.h
deleted file mode 100644
index 81d40cb..0000000
--- a/libjava/javax/print/attribute/standard/SheetCollate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_SheetCollate__
-#define __javax_print_attribute_standard_SheetCollate__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class SheetCollate;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::SheetCollate : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  SheetCollate(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 7080587914259873003LL;
-public:
-  static ::javax::print::attribute::standard::SheetCollate * UNCOLLATED;
-  static ::javax::print::attribute::standard::SheetCollate * COLLATED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::SheetCollate * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_SheetCollate__
diff --git a/libjava/javax/print/attribute/standard/Sides.h b/libjava/javax/print/attribute/standard/Sides.h
deleted file mode 100644
index 9f3072b..0000000
--- a/libjava/javax/print/attribute/standard/Sides.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Sides__
-#define __javax_print_attribute_standard_Sides__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Sides;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Sides : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Sides(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -6890309414893262822LL;
-public:
-  static ::javax::print::attribute::standard::Sides * ONE_SIDED;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_LONG_EDGE;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_SHORT_EDGE;
-  static ::javax::print::attribute::standard::Sides * DUPLEX;
-  static ::javax::print::attribute::standard::Sides * TUMBLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Sides * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Sides__
diff --git a/libjava/javax/print/event/PrintEvent.h b/libjava/javax/print/event/PrintEvent.h
deleted file mode 100644
index e69675a..0000000
--- a/libjava/javax/print/event/PrintEvent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintEvent__
-#define __javax_print_event_PrintEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintEvent : public ::java::util::EventObject
-{
-
-public:
-  PrintEvent(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintEvent__
diff --git a/libjava/javax/print/event/PrintJobAdapter.h b/libjava/javax/print/event/PrintJobAdapter.h
deleted file mode 100644
index 2137f46..0000000
--- a/libjava/javax/print/event/PrintJobAdapter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAdapter__
-#define __javax_print_event_PrintJobAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAdapter;
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAdapter : public ::java::lang::Object
-{
-
-public:
-  PrintJobAdapter();
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *);
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *);
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAdapter__
diff --git a/libjava/javax/print/event/PrintJobAttributeEvent.h b/libjava/javax/print/event/PrintJobAttributeEvent.h
deleted file mode 100644
index d3fcc6c..0000000
--- a/libjava/javax/print/event/PrintJobAttributeEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeEvent__
-#define __javax_print_event_PrintJobAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobAttributeEvent(::javax::print::DocPrintJob *, ::javax::print::attribute::PrintJobAttributeSet *);
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes();
-private:
-  static const jlong serialVersionUID = -6534469883874742101LL;
-  ::javax::print::attribute::PrintJobAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAttributeEvent__
diff --git a/libjava/javax/print/event/PrintJobAttributeListener.h b/libjava/javax/print/event/PrintJobAttributeListener.h
deleted file mode 100644
index 7b7581c..0000000
--- a/libjava/javax/print/event/PrintJobAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeListener__
-#define __javax_print_event_PrintJobAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-          class PrintJobAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintJobAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobAttributeListener__
diff --git a/libjava/javax/print/event/PrintJobEvent.h b/libjava/javax/print/event/PrintJobEvent.h
deleted file mode 100644
index a052e07..0000000
--- a/libjava/javax/print/event/PrintJobEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobEvent__
-#define __javax_print_event_PrintJobEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace event
-      {
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobEvent(::javax::print::DocPrintJob *, jint);
-  virtual jint getPrintEventType();
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-private:
-  static const jlong serialVersionUID = -1711656903622072997LL;
-public:
-  static const jint DATA_TRANSFER_COMPLETE = 106;
-  static const jint JOB_CANCELED = 101;
-  static const jint JOB_COMPLETE = 102;
-  static const jint JOB_FAILED = 103;
-  static const jint NO_MORE_EVENTS = 105;
-  static const jint REQUIRES_ATTENTION = 104;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) reason;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobEvent__
diff --git a/libjava/javax/print/event/PrintJobListener.h b/libjava/javax/print/event/PrintJobListener.h
deleted file mode 100644
index 2dbc20e..0000000
--- a/libjava/javax/print/event/PrintJobListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobListener__
-#define __javax_print_event_PrintJobListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobEvent;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobListener : public ::java::lang::Object
-{
-
-public:
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobListener__
diff --git a/libjava/javax/print/event/PrintServiceAttributeEvent.h b/libjava/javax/print/event/PrintServiceAttributeEvent.h
deleted file mode 100644
index baceddb..0000000
--- a/libjava/javax/print/event/PrintServiceAttributeEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeEvent__
-#define __javax_print_event_PrintServiceAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintService;
-      namespace attribute
-      {
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintServiceAttributeEvent(::javax::print::PrintService *, ::javax::print::attribute::PrintServiceAttributeSet *);
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes();
-private:
-  ::javax::print::attribute::PrintServiceAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintServiceAttributeEvent__
diff --git a/libjava/javax/print/event/PrintServiceAttributeListener.h b/libjava/javax/print/event/PrintServiceAttributeListener.h
deleted file mode 100644
index 95b5236..0000000
--- a/libjava/javax/print/event/PrintServiceAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeListener__
-#define __javax_print_event_PrintServiceAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintServiceAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintServiceAttributeListener__