2009-06-29 Andrew Haley <aph@redhat.com>

	PR java/40590	
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl):
	Use printName().
	* tools/gnu/classpath/tools/javah/Keywords.java (words): Replace
	with keywords list from  gcc/java/mangle.c.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods):
	Don't pre-convert a C++ keyword.
	(print(CniPrintStream)): Call CniPrintStream.printName().
	(printContents): Likewise.
	* tools/gnu/classpath/tools/javah/CniPrintStream.java
	(getClassName): Don't call replaceAll("/", "::").
	(print(Type)): Add ""::" befor name, " *" after.  Use printName(), not
	print.
	(printName(PrintStream, String), printName(String), printlnName):
	New methods.
	(moveToPackage): Use printName().

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590
	* java-tree.h (cxx_keyword_p): New declaration.
	* mangle_name.c (utf8_cmp): Move here from mangle.c.
	(cxx_keywords): Likewise.
	(cxx_keyword_p): Likewise.
	(MANGLE_CXX_KEYWORDS): New macro.
	(append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS.
	(append_gpp_mangled_name): Likewise.
	* mangle.c: Move code to mangle_name.c.
	(mangle_member_name): Don't call cxx_keyword_p.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149059 138bc75d-0d04-0410-961f-82ee72b054a4

49 files changed, 112 insertions, 112 deletions

diff --git a/libjava/gnu/xml/xpath/AndExpr.h b/libjava/gnu/xml/xpath/AndExpr.h
index 69c310d3779..dd57695fc5b 100644
--- a/libjava/gnu/xml/xpath/AndExpr.h
+++ b/libjava/gnu/xml/xpath/AndExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/ArithmeticExpr.h b/libjava/gnu/xml/xpath/ArithmeticExpr.h
index eb7773b8ba5..586ff4a323e 100644
--- a/libjava/gnu/xml/xpath/ArithmeticExpr.h
+++ b/libjava/gnu/xml/xpath/ArithmeticExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   static const jint ADD = 0;
diff --git a/libjava/gnu/xml/xpath/BooleanFunction.h b/libjava/gnu/xml/xpath/BooleanFunction.h
index ab54f6cd728..7688d9e02cf 100644
--- a/libjava/gnu/xml/xpath/BooleanFunction.h
+++ b/libjava/gnu/xml/xpath/BooleanFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/CeilingFunction.h b/libjava/gnu/xml/xpath/CeilingFunction.h
index 4350f310987..368ff4a62dd 100644
--- a/libjava/gnu/xml/xpath/CeilingFunction.h
+++ b/libjava/gnu/xml/xpath/CeilingFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/ConcatFunction.h b/libjava/gnu/xml/xpath/ConcatFunction.h
index 492cb12b0c5..db115180b07 100644
--- a/libjava/gnu/xml/xpath/ConcatFunction.h
+++ b/libjava/gnu/xml/xpath/ConcatFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Constant.h b/libjava/gnu/xml/xpath/Constant.h
index 51e14fed2e7..c957b37c347 100644
--- a/libjava/gnu/xml/xpath/Constant.h
+++ b/libjava/gnu/xml/xpath/Constant.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/ContainsFunction.h b/libjava/gnu/xml/xpath/ContainsFunction.h
index e33d07f995d..a426db1c2e6 100644
--- a/libjava/gnu/xml/xpath/ContainsFunction.h
+++ b/libjava/gnu/xml/xpath/ContainsFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/CountFunction.h b/libjava/gnu/xml/xpath/CountFunction.h
index 0741837949f..353380e3ecc 100644
--- a/libjava/gnu/xml/xpath/CountFunction.h
+++ b/libjava/gnu/xml/xpath/CountFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/EqualityExpr.h b/libjava/gnu/xml/xpath/EqualityExpr.h
index af6c0e29088..dbf51f7b08c 100644
--- a/libjava/gnu/xml/xpath/EqualityExpr.h
+++ b/libjava/gnu/xml/xpath/EqualityExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ private:
   jboolean evaluateImpl(::org::w3c::dom::Node *, jint, jint);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Expr.h b/libjava/gnu/xml/xpath/Expr.h
index a737f95a51a..ee88cc05227 100644
--- a/libjava/gnu/xml/xpath/Expr.h
+++ b/libjava/gnu/xml/xpath/Expr.h
@@ -30,7 +30,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -60,13 +60,13 @@ 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::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::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;
+  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 *);
diff --git a/libjava/gnu/xml/xpath/FalseFunction.h b/libjava/gnu/xml/xpath/FalseFunction.h
index 42df32629c1..22447e5edc4 100644
--- a/libjava/gnu/xml/xpath/FalseFunction.h
+++ b/libjava/gnu/xml/xpath/FalseFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/FloorFunction.h b/libjava/gnu/xml/xpath/FloorFunction.h
index 1fe02545e71..a3634d6731d 100644
--- a/libjava/gnu/xml/xpath/FloorFunction.h
+++ b/libjava/gnu/xml/xpath/FloorFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/FunctionCall.h b/libjava/gnu/xml/xpath/FunctionCall.h
index 09a4184405f..6039022f5e2 100644
--- a/libjava/gnu/xml/xpath/FunctionCall.h
+++ b/libjava/gnu/xml/xpath/FunctionCall.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -54,7 +54,7 @@ public:
   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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/IdFunction.h b/libjava/gnu/xml/xpath/IdFunction.h
index efe1f3e543c..a5fbc14c845 100644
--- a/libjava/gnu/xml/xpath/IdFunction.h
+++ b/libjava/gnu/xml/xpath/IdFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -52,7 +52,7 @@ public:
   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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/LangFunction.h b/libjava/gnu/xml/xpath/LangFunction.h
index d9c2123ff51..cf7bd65fe65 100644
--- a/libjava/gnu/xml/xpath/LangFunction.h
+++ b/libjava/gnu/xml/xpath/LangFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -54,7 +54,7 @@ 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/LastFunction.h b/libjava/gnu/xml/xpath/LastFunction.h
index 3af5ef634e7..f20cf55c4f6 100644
--- a/libjava/gnu/xml/xpath/LastFunction.h
+++ b/libjava/gnu/xml/xpath/LastFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.h b/libjava/gnu/xml/xpath/LocalNameFunction.h
index 3de7c9a8658..2743e172624 100644
--- a/libjava/gnu/xml/xpath/LocalNameFunction.h
+++ b/libjava/gnu/xml/xpath/LocalNameFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NameFunction.h b/libjava/gnu/xml/xpath/NameFunction.h
index b321cc2ba38..4e9db9a4fc8 100644
--- a/libjava/gnu/xml/xpath/NameFunction.h
+++ b/libjava/gnu/xml/xpath/NameFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NameTest.h b/libjava/gnu/xml/xpath/NameTest.h
index d81cf5f5166..823ea6be1dd 100644
--- a/libjava/gnu/xml/xpath/NameTest.h
+++ b/libjava/gnu/xml/xpath/NameTest.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -46,7 +46,7 @@ class gnu::xml::xpath::NameTest : public ::gnu::xml::xpath::Test
 {
 
 public:
-  NameTest(::javax::xml::namespace::QName *, jboolean, jboolean);
+  NameTest(::javax::xml::namespace$::QName *, jboolean, jboolean);
   jboolean matchesAny();
   jboolean matchesAnyLocalName();
   jboolean matches(::org::w3c::dom::Node *, jint, jint);
@@ -55,10 +55,10 @@ public: // actually package-private
   static jboolean equal(::java::lang::String *, ::java::lang::String *);
 public:
   ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  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;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
   jboolean anyLocalName;
   jboolean any;
 public:
diff --git a/libjava/gnu/xml/xpath/NamespaceTest.h b/libjava/gnu/xml/xpath/NamespaceTest.h
index 584a538e1ae..55095195aa3 100644
--- a/libjava/gnu/xml/xpath/NamespaceTest.h
+++ b/libjava/gnu/xml/xpath/NamespaceTest.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -46,15 +46,15 @@ class gnu::xml::xpath::NamespaceTest : public ::gnu::xml::xpath::Test
 {
 
 public:
-  NamespaceTest(::javax::xml::namespace::QName *, jboolean, jboolean);
+  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 *);
+  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;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
   jboolean anyLocalName;
   jboolean any;
 public:
diff --git a/libjava/gnu/xml/xpath/NamespaceUriFunction.h b/libjava/gnu/xml/xpath/NamespaceUriFunction.h
index 0838222b03f..76e04604577 100644
--- a/libjava/gnu/xml/xpath/NamespaceUriFunction.h
+++ b/libjava/gnu/xml/xpath/NamespaceUriFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NegativeExpr.h b/libjava/gnu/xml/xpath/NegativeExpr.h
index bc4a176f521..21b9322636d 100644
--- a/libjava/gnu/xml/xpath/NegativeExpr.h
+++ b/libjava/gnu/xml/xpath/NegativeExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NodeTypeTest.h b/libjava/gnu/xml/xpath/NodeTypeTest.h
index 952aee4fc9b..da631d9296e 100644
--- a/libjava/gnu/xml/xpath/NodeTypeTest.h
+++ b/libjava/gnu/xml/xpath/NodeTypeTest.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -52,7 +52,7 @@ public:
   ::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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   jshort __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) type;
diff --git a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
index 6637aec97de..ade9d2caa81 100644
--- a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
+++ b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NotFunction.h b/libjava/gnu/xml/xpath/NotFunction.h
index 117055bfe2a..c2f7499673d 100644
--- a/libjava/gnu/xml/xpath/NotFunction.h
+++ b/libjava/gnu/xml/xpath/NotFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/NumberFunction.h b/libjava/gnu/xml/xpath/NumberFunction.h
index bdbeafe65ec..92937fdb15f 100644
--- a/libjava/gnu/xml/xpath/NumberFunction.h
+++ b/libjava/gnu/xml/xpath/NumberFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/OrExpr.h b/libjava/gnu/xml/xpath/OrExpr.h
index 8296fc686b6..9cd5f9594bb 100644
--- a/libjava/gnu/xml/xpath/OrExpr.h
+++ b/libjava/gnu/xml/xpath/OrExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/ParenthesizedExpr.h b/libjava/gnu/xml/xpath/ParenthesizedExpr.h
index 09a5efaeb5f..3a228ade884 100644
--- a/libjava/gnu/xml/xpath/ParenthesizedExpr.h
+++ b/libjava/gnu/xml/xpath/ParenthesizedExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/PositionFunction.h b/libjava/gnu/xml/xpath/PositionFunction.h
index 4a06fb03a01..849f9c7495f 100644
--- a/libjava/gnu/xml/xpath/PositionFunction.h
+++ b/libjava/gnu/xml/xpath/PositionFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/Predicate.h b/libjava/gnu/xml/xpath/Predicate.h
index da2df353f89..d51d05926b0 100644
--- a/libjava/gnu/xml/xpath/Predicate.h
+++ b/libjava/gnu/xml/xpath/Predicate.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 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;
diff --git a/libjava/gnu/xml/xpath/RelationalExpr.h b/libjava/gnu/xml/xpath/RelationalExpr.h
index 727282e642c..3decec0dd29 100644
--- a/libjava/gnu/xml/xpath/RelationalExpr.h
+++ b/libjava/gnu/xml/xpath/RelationalExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Root.h b/libjava/gnu/xml/xpath/Root.h
index 3988c14deb7..37ce921fd60 100644
--- a/libjava/gnu/xml/xpath/Root.h
+++ b/libjava/gnu/xml/xpath/Root.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/RoundFunction.h b/libjava/gnu/xml/xpath/RoundFunction.h
index 6568dc13290..97dbf14ab39 100644
--- a/libjava/gnu/xml/xpath/RoundFunction.h
+++ b/libjava/gnu/xml/xpath/RoundFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Selector.h b/libjava/gnu/xml/xpath/Selector.h
index 8b0495ff69b..9dcd37a4e3f 100644
--- a/libjava/gnu/xml/xpath/Selector.h
+++ b/libjava/gnu/xml/xpath/Selector.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -72,7 +72,7 @@ public: // actually package-private
   jboolean isNamespaceAttribute(::org::w3c::dom::Node *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static const jint ANCESTOR = 0;
   static const jint ANCESTOR_OR_SELF = 1;
diff --git a/libjava/gnu/xml/xpath/StartsWithFunction.h b/libjava/gnu/xml/xpath/StartsWithFunction.h
index 34b5ff12922..c3900e4a475 100644
--- a/libjava/gnu/xml/xpath/StartsWithFunction.h
+++ b/libjava/gnu/xml/xpath/StartsWithFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Steps.h b/libjava/gnu/xml/xpath/Steps.h
index f2802895675..db4260555d3 100644
--- a/libjava/gnu/xml/xpath/Steps.h
+++ b/libjava/gnu/xml/xpath/Steps.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -61,7 +61,7 @@ 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/StringFunction.h b/libjava/gnu/xml/xpath/StringFunction.h
index 0e2e907e7be..0f96aa2d894 100644
--- a/libjava/gnu/xml/xpath/StringFunction.h
+++ b/libjava/gnu/xml/xpath/StringFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/StringLengthFunction.h b/libjava/gnu/xml/xpath/StringLengthFunction.h
index a181d292343..92f7ce14a48 100644
--- a/libjava/gnu/xml/xpath/StringLengthFunction.h
+++ b/libjava/gnu/xml/xpath/StringLengthFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/SubstringAfterFunction.h b/libjava/gnu/xml/xpath/SubstringAfterFunction.h
index 4c89a7c072d..fa9fed3b380 100644
--- a/libjava/gnu/xml/xpath/SubstringAfterFunction.h
+++ b/libjava/gnu/xml/xpath/SubstringAfterFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
index 97d2fd0de11..f8056be5bb8 100644
--- a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
+++ b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/SubstringFunction.h b/libjava/gnu/xml/xpath/SubstringFunction.h
index 51a3d052c65..d56e1b9da80 100644
--- a/libjava/gnu/xml/xpath/SubstringFunction.h
+++ b/libjava/gnu/xml/xpath/SubstringFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/SumFunction.h b/libjava/gnu/xml/xpath/SumFunction.h
index aeb7e163df6..3a7b6e043a8 100644
--- a/libjava/gnu/xml/xpath/SumFunction.h
+++ b/libjava/gnu/xml/xpath/SumFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/Test.h b/libjava/gnu/xml/xpath/Test.h
index 2e5f77f3543..64510e85fc3 100644
--- a/libjava/gnu/xml/xpath/Test.h
+++ b/libjava/gnu/xml/xpath/Test.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -48,7 +48,7 @@ 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;
+  virtual jboolean references(::javax::xml::namespace$::QName *) = 0;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/gnu/xml/xpath/TranslateFunction.h b/libjava/gnu/xml/xpath/TranslateFunction.h
index b2a708a19fa..b1e168058d2 100644
--- a/libjava/gnu/xml/xpath/TranslateFunction.h
+++ b/libjava/gnu/xml/xpath/TranslateFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public: // actually package-private
 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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/TrueFunction.h b/libjava/gnu/xml/xpath/TrueFunction.h
index a5958170cb5..27e42ddbaa6 100644
--- a/libjava/gnu/xml/xpath/TrueFunction.h
+++ b/libjava/gnu/xml/xpath/TrueFunction.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public: // actually package-private
 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 *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/UnionExpr.h b/libjava/gnu/xml/xpath/UnionExpr.h
index 1186ee27c6a..bbac92a822d 100644
--- a/libjava/gnu/xml/xpath/UnionExpr.h
+++ b/libjava/gnu/xml/xpath/UnionExpr.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public:
   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 *);
+  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;
diff --git a/libjava/gnu/xml/xpath/VariableReference.h b/libjava/gnu/xml/xpath/VariableReference.h
index c1a611c55d6..ea5c1a6e889 100644
--- a/libjava/gnu/xml/xpath/VariableReference.h
+++ b/libjava/gnu/xml/xpath/VariableReference.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,14 +50,14 @@ class gnu::xml::xpath::VariableReference : public ::gnu::xml::xpath::Expr
 {
 
 public:
-  VariableReference(::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::namespace::QName *);
+  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 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;
+  ::javax::xml::namespace$::QName * name;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/xpath/XPathImpl.h b/libjava/gnu/xml/xpath/XPathImpl.h
index 1f84db72175..f1bc5a36576 100644
--- a/libjava/gnu/xml/xpath/XPathImpl.h
+++ b/libjava/gnu/xml/xpath/XPathImpl.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -53,23 +53,23 @@ 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 *);
+  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 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::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::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::namespace$::NamespaceContext * namespaceContext;
   ::javax::xml::xpath::XPathVariableResolver * variableResolver;
   ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
 public:
diff --git a/libjava/gnu/xml/xpath/XPathParser.h b/libjava/gnu/xml/xpath/XPathParser.h
index 13c48744ff1..0133a04512d 100644
--- a/libjava/gnu/xml/xpath/XPathParser.h
+++ b/libjava/gnu/xml/xpath/XPathParser.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -47,7 +47,7 @@ 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 ::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 *);
@@ -61,7 +61,7 @@ public: // actually protected
 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::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext;
   ::javax::xml::xpath::XPathVariableResolver * variableResolver;
   ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
 public: