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

69 files changed, 0 insertions, 3983 deletions

diff --git a/libjava/gnu/xml/xpath/AndExpr.h b/libjava/gnu/xml/xpath/AndExpr.h
deleted file mode 100644
index dd57695..0000000
--- a/libjava/gnu/xml/xpath/AndExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_AndExpr__
-#define __gnu_xml_xpath_AndExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class AndExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::AndExpr : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  AndExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_AndExpr__
diff --git a/libjava/gnu/xml/xpath/ArithmeticExpr.h b/libjava/gnu/xml/xpath/ArithmeticExpr.h
deleted file mode 100644
index 586ff4a..0000000
--- a/libjava/gnu/xml/xpath/ArithmeticExpr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ArithmeticExpr__
-#define __gnu_xml_xpath_ArithmeticExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ArithmeticExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ArithmeticExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ArithmeticExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jint);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jint ADD = 0;
-  static const jint SUBTRACT = 1;
-  static const jint MULTIPLY = 2;
-  static const jint DIVIDE = 3;
-  static const jint MODULO = 4;
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jint op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ArithmeticExpr__
diff --git a/libjava/gnu/xml/xpath/BooleanFunction.h b/libjava/gnu/xml/xpath/BooleanFunction.h
deleted file mode 100644
index 7688d9e..0000000
--- a/libjava/gnu/xml/xpath/BooleanFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_BooleanFunction__
-#define __gnu_xml_xpath_BooleanFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class BooleanFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::BooleanFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  BooleanFunction(::java::util::List *);
-  BooleanFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_BooleanFunction__
diff --git a/libjava/gnu/xml/xpath/CeilingFunction.h b/libjava/gnu/xml/xpath/CeilingFunction.h
deleted file mode 100644
index 368ff4a..0000000
--- a/libjava/gnu/xml/xpath/CeilingFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_CeilingFunction__
-#define __gnu_xml_xpath_CeilingFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class CeilingFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::CeilingFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  CeilingFunction(::java::util::List *);
-  CeilingFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_CeilingFunction__
diff --git a/libjava/gnu/xml/xpath/ConcatFunction.h b/libjava/gnu/xml/xpath/ConcatFunction.h
deleted file mode 100644
index db11518..0000000
--- a/libjava/gnu/xml/xpath/ConcatFunction.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ConcatFunction__
-#define __gnu_xml_xpath_ConcatFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ConcatFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ConcatFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ConcatFunction(::java::util::List *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ConcatFunction__
diff --git a/libjava/gnu/xml/xpath/Constant.h b/libjava/gnu/xml/xpath/Constant.h
deleted file mode 100644
index c957b37..0000000
--- a/libjava/gnu/xml/xpath/Constant.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Constant__
-#define __gnu_xml_xpath_Constant__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Constant;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Constant : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  Constant(::java::lang::Object *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Constant__
diff --git a/libjava/gnu/xml/xpath/ContainsFunction.h b/libjava/gnu/xml/xpath/ContainsFunction.h
deleted file mode 100644
index a426db1..0000000
--- a/libjava/gnu/xml/xpath/ContainsFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ContainsFunction__
-#define __gnu_xml_xpath_ContainsFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ContainsFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ContainsFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ContainsFunction(::java::util::List *);
-  ContainsFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ContainsFunction__
diff --git a/libjava/gnu/xml/xpath/CountFunction.h b/libjava/gnu/xml/xpath/CountFunction.h
deleted file mode 100644
index 353380e..0000000
--- a/libjava/gnu/xml/xpath/CountFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_CountFunction__
-#define __gnu_xml_xpath_CountFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class CountFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::CountFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  CountFunction(::java::util::List *);
-  CountFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_CountFunction__
diff --git a/libjava/gnu/xml/xpath/DocumentOrderComparator.h b/libjava/gnu/xml/xpath/DocumentOrderComparator.h
deleted file mode 100644
index 26abc2c..0000000
--- a/libjava/gnu/xml/xpath/DocumentOrderComparator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_DocumentOrderComparator__
-#define __gnu_xml_xpath_DocumentOrderComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class DocumentOrderComparator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object
-{
-
-public:
-  DocumentOrderComparator();
-  virtual jint DocumentOrderComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_DocumentOrderComparator__
diff --git a/libjava/gnu/xml/xpath/EqualityExpr.h b/libjava/gnu/xml/xpath/EqualityExpr.h
deleted file mode 100644
index dbf51f7..0000000
--- a/libjava/gnu/xml/xpath/EqualityExpr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_EqualityExpr__
-#define __gnu_xml_xpath_EqualityExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class EqualityExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::EqualityExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  EqualityExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jboolean);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-private:
-  jboolean evaluateImpl(::org::w3c::dom::Node *, jint, jint);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jboolean invert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_EqualityExpr__
diff --git a/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h b/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h
deleted file mode 100644
index e806531..0000000
--- a/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Expr$ExprNodeSet__
-#define __gnu_xml_xpath_Expr$ExprNodeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr$ExprNodeSet;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Expr$ExprNodeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Expr$ExprNodeSet(::java::util::Collection *);
-public:
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Expr$ExprNodeSet__
diff --git a/libjava/gnu/xml/xpath/Expr.h b/libjava/gnu/xml/xpath/Expr.h
deleted file mode 100644
index ee88cc0..0000000
--- a/libjava/gnu/xml/xpath/Expr.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Expr__
-#define __gnu_xml_xpath_Expr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class DecimalFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Expr : public ::java::lang::Object
-{
-
-public:
-  Expr();
-  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::Object *);
-  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint) = 0;
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *) = 0;
-  virtual jboolean references(::javax::xml::namespace$::QName *) = 0;
-  static ::java::util::Collection * _id(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static ::java::lang::String * _local_name(::org::w3c::dom::Node *, ::java::util::Collection *);
-  static ::java::lang::String * _namespace_uri(::org::w3c::dom::Node *, ::java::util::Collection *);
-  static ::java::lang::String * _name(::org::w3c::dom::Node *, ::java::util::Collection *);
-public: // actually package-private
-  static ::org::w3c::dom::Node * firstNode(::java::util::Collection *);
-public:
-  static ::java::lang::String * _string(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static jboolean _boolean(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static jdouble _number(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static ::java::lang::String * stringValue(::java::util::Collection *);
-  static ::java::lang::String * stringValue(::org::w3c::dom::Node *);
-public: // actually package-private
-  static ::java::lang::String * stringValue(::org::w3c::dom::Node *, jboolean);
-  static jint intValue(::java::lang::Object *);
-public: // actually protected
-  static ::java::util::Comparator * documentOrderComparator;
-  static ::java::text::DecimalFormat * decimalFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Expr__
diff --git a/libjava/gnu/xml/xpath/FalseFunction.h b/libjava/gnu/xml/xpath/FalseFunction.h
deleted file mode 100644
index 22447e5..0000000
--- a/libjava/gnu/xml/xpath/FalseFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FalseFunction__
-#define __gnu_xml_xpath_FalseFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FalseFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FalseFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FalseFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FalseFunction__
diff --git a/libjava/gnu/xml/xpath/FloorFunction.h b/libjava/gnu/xml/xpath/FloorFunction.h
deleted file mode 100644
index a3634d6..0000000
--- a/libjava/gnu/xml/xpath/FloorFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FloorFunction__
-#define __gnu_xml_xpath_FloorFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FloorFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FloorFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FloorFunction(::java::util::List *);
-  FloorFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FloorFunction__
diff --git a/libjava/gnu/xml/xpath/Function.h b/libjava/gnu/xml/xpath/Function.h
deleted file mode 100644
index e4d457c..0000000
--- a/libjava/gnu/xml/xpath/Function.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Function__
-#define __gnu_xml_xpath_Function__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Function;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Function : public ::java::lang::Object
-{
-
-public:
-  virtual void setArguments(::java::util::List *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_xml_xpath_Function__
diff --git a/libjava/gnu/xml/xpath/FunctionCall.h b/libjava/gnu/xml/xpath/FunctionCall.h
deleted file mode 100644
index 6039022..0000000
--- a/libjava/gnu/xml/xpath/FunctionCall.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FunctionCall__
-#define __gnu_xml_xpath_FunctionCall__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FunctionCall;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunctionResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FunctionCall : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  FunctionCall(::javax::xml::xpath::XPathFunctionResolver *, ::java::lang::String *);
-  FunctionCall(::javax::xml::xpath::XPathFunctionResolver *, ::java::lang::String *, ::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::xpath::XPathFunctionResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver;
-  ::java::lang::String * name;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FunctionCall__
diff --git a/libjava/gnu/xml/xpath/IdFunction.h b/libjava/gnu/xml/xpath/IdFunction.h
deleted file mode 100644
index a5fbc14..0000000
--- a/libjava/gnu/xml/xpath/IdFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_IdFunction__
-#define __gnu_xml_xpath_IdFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class IdFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::IdFunction : public ::gnu::xml::xpath::Pattern
-{
-
-public: // actually package-private
-  IdFunction(::java::util::List *);
-public:
-  IdFunction(::gnu::xml::xpath::Expr *);
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_IdFunction__
diff --git a/libjava/gnu/xml/xpath/LangFunction.h b/libjava/gnu/xml/xpath/LangFunction.h
deleted file mode 100644
index cf7bd65..0000000
--- a/libjava/gnu/xml/xpath/LangFunction.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LangFunction__
-#define __gnu_xml_xpath_LangFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LangFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LangFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LangFunction(::java::util::List *);
-  LangFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::lang::String * getLang(::org::w3c::dom::Node *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LangFunction__
diff --git a/libjava/gnu/xml/xpath/LastFunction.h b/libjava/gnu/xml/xpath/LastFunction.h
deleted file mode 100644
index f20cf55..0000000
--- a/libjava/gnu/xml/xpath/LastFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LastFunction__
-#define __gnu_xml_xpath_LastFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LastFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LastFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LastFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LastFunction__
diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.h b/libjava/gnu/xml/xpath/LocalNameFunction.h
deleted file mode 100644
index 2743e17..0000000
--- a/libjava/gnu/xml/xpath/LocalNameFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LocalNameFunction__
-#define __gnu_xml_xpath_LocalNameFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LocalNameFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LocalNameFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LocalNameFunction(::java::util::List *);
-  LocalNameFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LocalNameFunction__
diff --git a/libjava/gnu/xml/xpath/NameFunction.h b/libjava/gnu/xml/xpath/NameFunction.h
deleted file mode 100644
index 4e9db9a..0000000
--- a/libjava/gnu/xml/xpath/NameFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NameFunction__
-#define __gnu_xml_xpath_NameFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NameFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NameFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NameFunction(::java::util::List *);
-  NameFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NameFunction__
diff --git a/libjava/gnu/xml/xpath/NameTest.h b/libjava/gnu/xml/xpath/NameTest.h
deleted file mode 100644
index 823ea6b..0000000
--- a/libjava/gnu/xml/xpath/NameTest.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NameTest__
-#define __gnu_xml_xpath_NameTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NameTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NameTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NameTest(::javax::xml::namespace$::QName *, jboolean, jboolean);
-  jboolean matchesAny();
-  jboolean matchesAnyLocalName();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  static ::java::lang::String * getLocalName(::org::w3c::dom::Node *);
-  static jboolean equal(::java::lang::String *, ::java::lang::String *);
-public:
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
-  jboolean anyLocalName;
-  jboolean any;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NameTest__
diff --git a/libjava/gnu/xml/xpath/NamespaceTest.h b/libjava/gnu/xml/xpath/NamespaceTest.h
deleted file mode 100644
index 5509519..0000000
--- a/libjava/gnu/xml/xpath/NamespaceTest.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NamespaceTest__
-#define __gnu_xml_xpath_NamespaceTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NamespaceTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NamespaceTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NamespaceTest(::javax::xml::namespace$::QName *, jboolean, jboolean);
-  jboolean matchesAny();
-  jboolean matchesAnyLocalName();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
-  jboolean anyLocalName;
-  jboolean any;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NamespaceTest__
diff --git a/libjava/gnu/xml/xpath/NamespaceUriFunction.h b/libjava/gnu/xml/xpath/NamespaceUriFunction.h
deleted file mode 100644
index 76e0460..0000000
--- a/libjava/gnu/xml/xpath/NamespaceUriFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NamespaceUriFunction__
-#define __gnu_xml_xpath_NamespaceUriFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NamespaceUriFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NamespaceUriFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NamespaceUriFunction(::java::util::List *);
-  NamespaceUriFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NamespaceUriFunction__
diff --git a/libjava/gnu/xml/xpath/NegativeExpr.h b/libjava/gnu/xml/xpath/NegativeExpr.h
deleted file mode 100644
index 21b9322..0000000
--- a/libjava/gnu/xml/xpath/NegativeExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NegativeExpr__
-#define __gnu_xml_xpath_NegativeExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NegativeExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NegativeExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NegativeExpr(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NegativeExpr__
diff --git a/libjava/gnu/xml/xpath/NodeTypeTest.h b/libjava/gnu/xml/xpath/NodeTypeTest.h
deleted file mode 100644
index da631d9..0000000
--- a/libjava/gnu/xml/xpath/NodeTypeTest.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NodeTypeTest__
-#define __gnu_xml_xpath_NodeTypeTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NodeTypeTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NodeTypeTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NodeTypeTest(jshort);
-  NodeTypeTest(jshort, ::java::lang::String *);
-  jshort getNodeType();
-  ::java::lang::String * getData();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) type;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NodeTypeTest__
diff --git a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
deleted file mode 100644
index ade9d2ca..0000000
--- a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NormalizeSpaceFunction__
-#define __gnu_xml_xpath_NormalizeSpaceFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NormalizeSpaceFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NormalizeSpaceFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NormalizeSpaceFunction(::java::util::List *);
-  NormalizeSpaceFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NormalizeSpaceFunction__
diff --git a/libjava/gnu/xml/xpath/NotFunction.h b/libjava/gnu/xml/xpath/NotFunction.h
deleted file mode 100644
index c2f7499..0000000
--- a/libjava/gnu/xml/xpath/NotFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NotFunction__
-#define __gnu_xml_xpath_NotFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NotFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NotFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NotFunction(::java::util::List *);
-  NotFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NotFunction__
diff --git a/libjava/gnu/xml/xpath/NumberFunction.h b/libjava/gnu/xml/xpath/NumberFunction.h
deleted file mode 100644
index 92937fd..0000000
--- a/libjava/gnu/xml/xpath/NumberFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NumberFunction__
-#define __gnu_xml_xpath_NumberFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NumberFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NumberFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NumberFunction(::java::util::List *);
-  NumberFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NumberFunction__
diff --git a/libjava/gnu/xml/xpath/OrExpr.h b/libjava/gnu/xml/xpath/OrExpr.h
deleted file mode 100644
index 9cd5f95..0000000
--- a/libjava/gnu/xml/xpath/OrExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_OrExpr__
-#define __gnu_xml_xpath_OrExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class OrExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::OrExpr : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  OrExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_OrExpr__
diff --git a/libjava/gnu/xml/xpath/ParenthesizedExpr.h b/libjava/gnu/xml/xpath/ParenthesizedExpr.h
deleted file mode 100644
index 3a228ad..0000000
--- a/libjava/gnu/xml/xpath/ParenthesizedExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ParenthesizedExpr__
-#define __gnu_xml_xpath_ParenthesizedExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class ParenthesizedExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ParenthesizedExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ParenthesizedExpr(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ParenthesizedExpr__
diff --git a/libjava/gnu/xml/xpath/Path.h b/libjava/gnu/xml/xpath/Path.h
deleted file mode 100644
index f36b5cef..0000000
--- a/libjava/gnu/xml/xpath/Path.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Path__
-#define __gnu_xml_xpath_Path__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Path;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Path : public ::gnu::xml::xpath::Pattern
-{
-
-public: // actually package-private
-  Path();
-  virtual ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Path__
diff --git a/libjava/gnu/xml/xpath/Pattern.h b/libjava/gnu/xml/xpath/Pattern.h
deleted file mode 100644
index 917835e..0000000
--- a/libjava/gnu/xml/xpath/Pattern.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Pattern__
-#define __gnu_xml_xpath_Pattern__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Pattern;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Pattern : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  Pattern();
-  virtual jboolean matches(::org::w3c::dom::Node *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Pattern__
diff --git a/libjava/gnu/xml/xpath/PositionFunction.h b/libjava/gnu/xml/xpath/PositionFunction.h
deleted file mode 100644
index 849f9c7..0000000
--- a/libjava/gnu/xml/xpath/PositionFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_PositionFunction__
-#define __gnu_xml_xpath_PositionFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class PositionFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::PositionFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  PositionFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_PositionFunction__
diff --git a/libjava/gnu/xml/xpath/Predicate.h b/libjava/gnu/xml/xpath/Predicate.h
deleted file mode 100644
index d51d059..0000000
--- a/libjava/gnu/xml/xpath/Predicate.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Predicate__
-#define __gnu_xml_xpath_Predicate__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Predicate;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Predicate : public ::gnu::xml::xpath::Test
-{
-
-public: // actually package-private
-  Predicate(::gnu::xml::xpath::Expr *);
-public:
-  virtual jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Predicate__
diff --git a/libjava/gnu/xml/xpath/RelationalExpr.h b/libjava/gnu/xml/xpath/RelationalExpr.h
deleted file mode 100644
index 3decec0..0000000
--- a/libjava/gnu/xml/xpath/RelationalExpr.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_RelationalExpr__
-#define __gnu_xml_xpath_RelationalExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class RelationalExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::RelationalExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  RelationalExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jboolean, jboolean);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jboolean lt;
-  jboolean eq;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_RelationalExpr__
diff --git a/libjava/gnu/xml/xpath/Root.h b/libjava/gnu/xml/xpath/Root.h
deleted file mode 100644
index 37ce921..0000000
--- a/libjava/gnu/xml/xpath/Root.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Root__
-#define __gnu_xml_xpath_Root__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Root;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Root : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Root();
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Root__
diff --git a/libjava/gnu/xml/xpath/RoundFunction.h b/libjava/gnu/xml/xpath/RoundFunction.h
deleted file mode 100644
index 97dbf14..0000000
--- a/libjava/gnu/xml/xpath/RoundFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_RoundFunction__
-#define __gnu_xml_xpath_RoundFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class RoundFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::RoundFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  RoundFunction(::java::util::List *);
-  RoundFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_RoundFunction__
diff --git a/libjava/gnu/xml/xpath/Selector.h b/libjava/gnu/xml/xpath/Selector.h
deleted file mode 100644
index 9dcd37a..0000000
--- a/libjava/gnu/xml/xpath/Selector.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Selector__
-#define __gnu_xml_xpath_Selector__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Selector;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Selector : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Selector(jint, ::java::util::List *);
-  JArray< ::gnu::xml::xpath::Test * > * getTests();
-  jboolean matches(::org::w3c::dom::Node *);
-public: // actually package-private
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-private:
-  jint getContextPosition(::org::w3c::dom::Node *);
-  jint getContextSize(::org::w3c::dom::Node *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-  ::java::util::List * filterCandidates(::java::util::List *, jboolean);
-  void addCandidates(::org::w3c::dom::Node *, ::java::util::Collection *);
-  void addChildNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addParentNode(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addFollowingNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addPrecedingNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addAttributes(::org::w3c::dom::Node *, ::java::util::Collection *);
-  void addNamespaceAttributes(::org::w3c::dom::Node *, ::java::util::Collection *);
-  jboolean isNamespaceAttribute(::org::w3c::dom::Node *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static const jint ANCESTOR = 0;
-  static const jint ANCESTOR_OR_SELF = 1;
-  static const jint ATTRIBUTE = 2;
-  static const jint CHILD = 3;
-  static const jint DESCENDANT = 4;
-  static const jint DESCENDANT_OR_SELF = 5;
-  static const jint FOLLOWING = 6;
-  static const jint FOLLOWING_SIBLING = 7;
-  static const jint NAMESPACE = 8;
-  static const jint PARENT = 9;
-  static const jint PRECEDING = 10;
-  static const jint PRECEDING_SIBLING = 11;
-  static const jint SELF = 12;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Path)))) axis;
-  JArray< ::gnu::xml::xpath::Test * > * tests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Selector__
diff --git a/libjava/gnu/xml/xpath/StartsWithFunction.h b/libjava/gnu/xml/xpath/StartsWithFunction.h
deleted file mode 100644
index c3900e4..0000000
--- a/libjava/gnu/xml/xpath/StartsWithFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StartsWithFunction__
-#define __gnu_xml_xpath_StartsWithFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StartsWithFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StartsWithFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StartsWithFunction(::java::util::List *);
-  StartsWithFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StartsWithFunction__
diff --git a/libjava/gnu/xml/xpath/Steps.h b/libjava/gnu/xml/xpath/Steps.h
deleted file mode 100644
index db42605..0000000
--- a/libjava/gnu/xml/xpath/Steps.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Steps__
-#define __gnu_xml_xpath_Steps__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Pattern;
-          class Steps;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Steps : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Steps();
-public: // actually package-private
-  Steps(::java::util::LinkedList *);
-public:
-  jboolean matches(::org::w3c::dom::Node *);
-public: // actually package-private
-  jboolean matches(::org::w3c::dom::Node *, jint);
-  ::java::util::Collection * possibleContexts(::gnu::xml::xpath::Pattern *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Path)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Steps__
diff --git a/libjava/gnu/xml/xpath/StringFunction.h b/libjava/gnu/xml/xpath/StringFunction.h
deleted file mode 100644
index 0f96aa2..0000000
--- a/libjava/gnu/xml/xpath/StringFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StringFunction__
-#define __gnu_xml_xpath_StringFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StringFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StringFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StringFunction(::java::util::List *);
-  StringFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StringFunction__
diff --git a/libjava/gnu/xml/xpath/StringLengthFunction.h b/libjava/gnu/xml/xpath/StringLengthFunction.h
deleted file mode 100644
index 92f7ce1..0000000
--- a/libjava/gnu/xml/xpath/StringLengthFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StringLengthFunction__
-#define __gnu_xml_xpath_StringLengthFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StringLengthFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StringLengthFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StringLengthFunction(::java::util::List *);
-  StringLengthFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StringLengthFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringAfterFunction.h b/libjava/gnu/xml/xpath/SubstringAfterFunction.h
deleted file mode 100644
index fa9fed3..0000000
--- a/libjava/gnu/xml/xpath/SubstringAfterFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringAfterFunction__
-#define __gnu_xml_xpath_SubstringAfterFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringAfterFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringAfterFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringAfterFunction(::java::util::List *);
-  SubstringAfterFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringAfterFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
deleted file mode 100644
index f8056be..0000000
--- a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringBeforeFunction__
-#define __gnu_xml_xpath_SubstringBeforeFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringBeforeFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringBeforeFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringBeforeFunction(::java::util::List *);
-  SubstringBeforeFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringBeforeFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringFunction.h b/libjava/gnu/xml/xpath/SubstringFunction.h
deleted file mode 100644
index d56e1b9..0000000
--- a/libjava/gnu/xml/xpath/SubstringFunction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringFunction__
-#define __gnu_xml_xpath_SubstringFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringFunction(::java::util::List *);
-  SubstringFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-  ::gnu::xml::xpath::Expr * arg3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringFunction__
diff --git a/libjava/gnu/xml/xpath/SumFunction.h b/libjava/gnu/xml/xpath/SumFunction.h
deleted file mode 100644
index 3a7b6e0..0000000
--- a/libjava/gnu/xml/xpath/SumFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SumFunction__
-#define __gnu_xml_xpath_SumFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SumFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SumFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SumFunction(::java::util::List *);
-  SumFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SumFunction__
diff --git a/libjava/gnu/xml/xpath/Test.h b/libjava/gnu/xml/xpath/Test.h
deleted file mode 100644
index 64510e8..0000000
--- a/libjava/gnu/xml/xpath/Test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Test__
-#define __gnu_xml_xpath_Test__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Test : public ::java::lang::Object
-{
-
-public:
-  Test();
-  virtual jboolean matches(::org::w3c::dom::Node *, jint, jint) = 0;
-  virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *) = 0;
-  virtual jboolean references(::javax::xml::namespace$::QName *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Test__
diff --git a/libjava/gnu/xml/xpath/TranslateFunction.h b/libjava/gnu/xml/xpath/TranslateFunction.h
deleted file mode 100644
index b1e1680..0000000
--- a/libjava/gnu/xml/xpath/TranslateFunction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_TranslateFunction__
-#define __gnu_xml_xpath_TranslateFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class TranslateFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::TranslateFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  TranslateFunction(::java::util::List *);
-  TranslateFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-  ::gnu::xml::xpath::Expr * arg3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_TranslateFunction__
diff --git a/libjava/gnu/xml/xpath/TrueFunction.h b/libjava/gnu/xml/xpath/TrueFunction.h
deleted file mode 100644
index 27e42dd..0000000
--- a/libjava/gnu/xml/xpath/TrueFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_TrueFunction__
-#define __gnu_xml_xpath_TrueFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class TrueFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::TrueFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  TrueFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_TrueFunction__
diff --git a/libjava/gnu/xml/xpath/UnionExpr.h b/libjava/gnu/xml/xpath/UnionExpr.h
deleted file mode 100644
index bbac92a..0000000
--- a/libjava/gnu/xml/xpath/UnionExpr.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_UnionExpr__
-#define __gnu_xml_xpath_UnionExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class UnionExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::UnionExpr : public ::gnu::xml::xpath::Pattern
-{
-
-public:
-  UnionExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_UnionExpr__
diff --git a/libjava/gnu/xml/xpath/VariableReference.h b/libjava/gnu/xml/xpath/VariableReference.h
deleted file mode 100644
index ea5c1a6..0000000
--- a/libjava/gnu/xml/xpath/VariableReference.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_VariableReference__
-#define __gnu_xml_xpath_VariableReference__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class VariableReference;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::VariableReference : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  VariableReference(::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::xpath::XPathVariableResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver;
-  ::javax::xml::namespace$::QName * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_VariableReference__
diff --git a/libjava/gnu/xml/xpath/XPathFactoryImpl.h b/libjava/gnu/xml/xpath/XPathFactoryImpl.h
deleted file mode 100644
index 41349bf..0000000
--- a/libjava/gnu/xml/xpath/XPathFactoryImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathFactoryImpl__
-#define __gnu_xml_xpath_XPathFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPath;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathFactoryImpl : public ::javax::xml::xpath::XPathFactory
-{
-
-public:
-  XPathFactoryImpl();
-  virtual jboolean isObjectModelSupported(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *);
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *);
-  virtual ::javax::xml::xpath::XPath * newXPath();
-public: // actually package-private
-  ::javax::xml::xpath::XPathVariableResolver * __attribute__((aligned(__alignof__( ::javax::xml::xpath::XPathFactory)))) variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathFactoryImpl__
diff --git a/libjava/gnu/xml/xpath/XPathImpl.h b/libjava/gnu/xml/xpath/XPathImpl.h
deleted file mode 100644
index f1bc5a3..0000000
--- a/libjava/gnu/xml/xpath/XPathImpl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathImpl__
-#define __gnu_xml_xpath_XPathImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathImpl;
-          class XPathParser;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathExpression;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XPathImpl(::javax::xml::namespace$::NamespaceContext *, ::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::xpath::XPathFunctionResolver *);
-public:
-  virtual void reset();
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *);
-  virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver();
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *);
-  virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver();
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *);
-public: // actually package-private
-  ::gnu::xml::xpath::XPathParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parser;
-  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
-  ::javax::xml::xpath::XPathVariableResolver * variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathImpl__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h b/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h
deleted file mode 100644
index f364f4a..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyCheckClass__
-#define __gnu_xml_xpath_XPathParser$YyCheckClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyCheckClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyCheckClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyCheckClass();
-public:
-  static JArray< jshort > * yyCheck;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyCheckClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h b/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h
deleted file mode 100644
index 23cd340..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyDefRedClass__
-#define __gnu_xml_xpath_XPathParser$YyDefRedClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyDefRedClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyDefRedClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyDefRedClass();
-public:
-  static JArray< jshort > * yyDefRed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyDefRedClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h b/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h
deleted file mode 100644
index 97d0f1b..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyDgotoClass__
-#define __gnu_xml_xpath_XPathParser$YyDgotoClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyDgotoClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyDgotoClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyDgotoClass();
-public:
-  static JArray< jshort > * yyDgoto;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyDgotoClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h
deleted file mode 100644
index 1a2e31f..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyGindexClass__
-#define __gnu_xml_xpath_XPathParser$YyGindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyGindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyGindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyGindexClass();
-public:
-  static JArray< jshort > * yyGindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyGindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h b/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h
deleted file mode 100644
index 4e95f9d..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyLenClass__
-#define __gnu_xml_xpath_XPathParser$YyLenClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyLenClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyLenClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyLenClass();
-public:
-  static JArray< jshort > * yyLen;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyLenClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h b/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h
deleted file mode 100644
index c9c0ea4..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyLhsClass__
-#define __gnu_xml_xpath_XPathParser$YyLhsClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyLhsClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyLhsClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyLhsClass();
-public:
-  static JArray< jshort > * yyLhs;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyLhsClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h b/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h
deleted file mode 100644
index 216fcff..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyNameClass__
-#define __gnu_xml_xpath_XPathParser$YyNameClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyNameClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyNameClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyNameClass();
-public:
-  static JArray< ::java::lang::String * > * yyName;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyNameClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h
deleted file mode 100644
index d1a439e..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyRindexClass__
-#define __gnu_xml_xpath_XPathParser$YyRindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyRindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyRindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyRindexClass();
-public:
-  static JArray< jshort > * yyRindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyRindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h
deleted file mode 100644
index 2a129b2..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YySindexClass__
-#define __gnu_xml_xpath_XPathParser$YySindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YySindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YySindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YySindexClass();
-public:
-  static JArray< jshort > * yySindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YySindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h b/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h
deleted file mode 100644
index 2408d36..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyTableClass__
-#define __gnu_xml_xpath_XPathParser$YyTableClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyTableClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyTableClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyTableClass();
-public:
-  static JArray< jshort > * yyTable;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyTableClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$yyException.h b/libjava/gnu/xml/xpath/XPathParser$yyException.h
deleted file mode 100644
index bf25adb..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$yyException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$yyException__
-#define __gnu_xml_xpath_XPathParser$yyException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$yyException;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$yyException : public ::java::lang::Exception
-{
-
-public:
-  XPathParser$yyException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$yyException__
diff --git a/libjava/gnu/xml/xpath/XPathParser$yyInput.h b/libjava/gnu/xml/xpath/XPathParser$yyInput.h
deleted file mode 100644
index 4383ddf..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$yyInput.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$yyInput__
-#define __gnu_xml_xpath_XPathParser$yyInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$yyInput;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$yyInput : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean advance() = 0;
-  virtual jint token() = 0;
-  virtual ::java::lang::Object * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_xml_xpath_XPathParser$yyInput__
diff --git a/libjava/gnu/xml/xpath/XPathParser.h b/libjava/gnu/xml/xpath/XPathParser.h
deleted file mode 100644
index 0133a04..0000000
--- a/libjava/gnu/xml/xpath/XPathParser.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser__
-#define __gnu_xml_xpath_XPathParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class XPathParser;
-          class XPathParser$yyInput;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser : public ::java::lang::Object
-{
-
-public:
-  XPathParser();
-public: // actually package-private
-  virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *);
-  virtual ::gnu::xml::xpath::Expr * lookupFunction(::java::lang::String *, ::java::util::List *);
-public:
-  virtual void yyerror(::java::lang::String *);
-  virtual void yyerror(::java::lang::String *, JArray< ::java::lang::String * > *);
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * yyExpecting(jint);
-public:
-  virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *, ::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::Object * yyDefault(::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *);
-public: // actually package-private
-  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext;
-  ::javax::xml::xpath::XPathVariableResolver * variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static const jint LITERAL = 257;
-  static const jint DIGITS = 258;
-  static const jint NAME = 259;
-  static const jint LP = 260;
-  static const jint RP = 261;
-  static const jint LB = 262;
-  static const jint RB = 263;
-  static const jint COMMA = 264;
-  static const jint PIPE = 265;
-  static const jint SLASH = 266;
-  static const jint DOUBLE_SLASH = 267;
-  static const jint EQ = 268;
-  static const jint NE = 269;
-  static const jint GT = 270;
-  static const jint LT = 271;
-  static const jint GTE = 272;
-  static const jint LTE = 273;
-  static const jint PLUS = 274;
-  static const jint MINUS = 275;
-  static const jint AT = 276;
-  static const jint STAR = 277;
-  static const jint DOLLAR = 278;
-  static const jint COLON = 279;
-  static const jint DOUBLE_COLON = 280;
-  static const jint DOT = 281;
-  static const jint DOUBLE_DOT = 282;
-  static const jint ANCESTOR = 283;
-  static const jint ANCESTOR_OR_SELF = 284;
-  static const jint ATTRIBUTE = 285;
-  static const jint CHILD = 286;
-  static const jint DESCENDANT = 287;
-  static const jint DESCENDANT_OR_SELF = 288;
-  static const jint FOLLOWING = 289;
-  static const jint FOLLOWING_SIBLING = 290;
-  static const jint NAMESPACE = 291;
-  static const jint PARENT = 292;
-  static const jint PRECEDING = 293;
-  static const jint PRECEDING_SIBLING = 294;
-  static const jint SELF = 295;
-  static const jint DIV = 296;
-  static const jint MOD = 297;
-  static const jint OR = 298;
-  static const jint AND = 299;
-  static const jint COMMENT = 300;
-  static const jint PROCESSING_INSTRUCTION = 301;
-  static const jint TEXT = 302;
-  static const jint NODE = 303;
-  static const jint UNARY = 304;
-  static const jint yyErrorCode = 256;
-public: // actually protected
-  static const jint yyFinal = 30;
-  jint yyMax;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser__
diff --git a/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h b/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h
deleted file mode 100644
index ae01890..0000000
--- a/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathTokenizer$XPathToken__
-#define __gnu_xml_xpath_XPathTokenizer$XPathToken__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathTokenizer$XPathToken;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathTokenizer$XPathToken : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XPathTokenizer$XPathToken(jint);
-  XPathTokenizer$XPathToken(jint, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathTokenizer$XPathToken__
diff --git a/libjava/gnu/xml/xpath/XPathTokenizer.h b/libjava/gnu/xml/xpath/XPathTokenizer.h
deleted file mode 100644
index 4cbf9ec..0000000
--- a/libjava/gnu/xml/xpath/XPathTokenizer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathTokenizer__
-#define __gnu_xml_xpath_XPathTokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathTokenizer;
-          class XPathTokenizer$XPathToken;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathTokenizer : public ::java::lang::Object
-{
-
-public:
-  XPathTokenizer(::java::lang::String *);
-public: // actually package-private
-  XPathTokenizer(::java::io::Reader *);
-public:
-  virtual jboolean advance();
-  virtual jint token();
-  virtual ::java::lang::Object * value();
-public: // actually package-private
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_literal(jint);
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_digits(jint);
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_name(jint);
-  virtual jboolean isNameChar(jint);
-  static ::java::util::Map * keywords;
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::gnu::xml::xpath::XPathTokenizer$XPathToken * token__;
-  ::gnu::xml::xpath::XPathTokenizer$XPathToken * lastToken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathTokenizer__