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

104 files changed, 293 insertions, 293 deletions

diff --git a/libjava/gnu/xml/stream/AttributeImpl.h b/libjava/gnu/xml/stream/AttributeImpl.h
index 8fc37c01d3b..dac7c27333e 100644
--- a/libjava/gnu/xml/stream/AttributeImpl.h
+++ b/libjava/gnu/xml/stream/AttributeImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -39,16 +39,16 @@ class gnu::xml::stream::AttributeImpl : public ::gnu::xml::stream::XMLEventImpl
 {
 
 public: // actually protected
-  AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::lang::String *, ::java::lang::String *, jboolean);
+  AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::lang::String *, ::java::lang::String *, jboolean);
 public:
   virtual jint getEventType();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual ::java::lang::String * getValue();
   virtual ::java::lang::String * getDTDType();
   virtual jboolean isSpecified();
   virtual void writeAsEncodedUnicode(::java::io::Writer *);
 public: // actually protected
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
   ::java::lang::String * value;
   ::java::lang::String * type;
   jboolean specified;
diff --git a/libjava/gnu/xml/stream/EndElementImpl.h b/libjava/gnu/xml/stream/EndElementImpl.h
index cc1dba81601..2461d21d6c5 100644
--- a/libjava/gnu/xml/stream/EndElementImpl.h
+++ b/libjava/gnu/xml/stream/EndElementImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -39,14 +39,14 @@ class gnu::xml::stream::EndElementImpl : public ::gnu::xml::stream::XMLEventImpl
 {
 
 public: // actually protected
-  EndElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::util::List *);
+  EndElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *);
 public:
   virtual jint getEventType();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual ::java::util::Iterator * getNamespaces();
   virtual void writeAsEncodedUnicode(::java::io::Writer *);
 public: // actually protected
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
   ::java::util::List * namespaces;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/stream/StartElementImpl.h b/libjava/gnu/xml/stream/StartElementImpl.h
index 13b1dc64679..1cd062b20df 100644
--- a/libjava/gnu/xml/stream/StartElementImpl.h
+++ b/libjava/gnu/xml/stream/StartElementImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -44,21 +44,21 @@ class gnu::xml::stream::StartElementImpl : public ::gnu::xml::stream::XMLEventIm
 {
 
 public: // actually protected
-  StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace::NamespaceContext *);
+  StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace$::NamespaceContext *);
 public:
   virtual jint getEventType();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual ::java::util::Iterator * getAttributes();
   virtual ::java::util::Iterator * getNamespaces();
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *);
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
+  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *);
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
   virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
   virtual void writeAsEncodedUnicode(::java::io::Writer *);
 public: // actually protected
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
   ::java::util::List * attributes;
   ::java::util::List * namespaces;
-  ::javax::xml::namespace::NamespaceContext * namespaceContext;
+  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/stream/XIncludeFilter.h b/libjava/gnu/xml/stream/XIncludeFilter.h
index 36e488a6015..794eaa71c47 100644
--- a/libjava/gnu/xml/stream/XIncludeFilter.h
+++ b/libjava/gnu/xml/stream/XIncludeFilter.h
@@ -32,7 +32,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -79,7 +79,7 @@ public:
   virtual ::java::lang::String * getAttributeLocalName(jint);
   virtual ::java::lang::String * getAttributeNamespace(jint);
   virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
   virtual ::java::lang::String * getAttributeType(jint);
   virtual jboolean isAttributeSpecified(jint);
   virtual ::java::lang::String * getAttributeValue(jint);
@@ -87,7 +87,7 @@ public:
   virtual ::java::lang::String * getElementText();
   virtual jint getEventType();
   virtual ::java::lang::String * getLocalName();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual ::java::lang::String * getNamespaceURI();
   virtual ::java::lang::String * getPIData();
   virtual ::java::lang::String * getPITarget();
diff --git a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h b/libjava/gnu/xml/stream/XMLEventFactoryImpl.h
index b8ebf0bcda5..714dbc18233 100644
--- a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h
+++ b/libjava/gnu/xml/stream/XMLEventFactoryImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -59,14 +59,14 @@ public:
   virtual void setLocation(::javax::xml::stream::Location *);
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *);
+  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *);
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *);
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *);
+  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *);
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace::NamespaceContext *);
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *);
+  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *);
+  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *);
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *);
   virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *);
diff --git a/libjava/gnu/xml/stream/XMLEventImpl.h b/libjava/gnu/xml/stream/XMLEventImpl.h
index 46432d3506d..13b793ef1c7 100644
--- a/libjava/gnu/xml/stream/XMLEventImpl.h
+++ b/libjava/gnu/xml/stream/XMLEventImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -61,7 +61,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement();
   virtual ::javax::xml::stream::events::EndElement * asEndElement();
   virtual ::javax::xml::stream::events::Characters * asCharacters();
-  virtual ::javax::xml::namespace::QName * getSchemaType();
+  virtual ::javax::xml::namespace$::QName * getSchemaType();
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
 public: // actually protected
   virtual ::java::lang::String * encode(::java::lang::String *, jboolean);
diff --git a/libjava/gnu/xml/stream/XMLEventWriterImpl.h b/libjava/gnu/xml/stream/XMLEventWriterImpl.h
index 77c10a53399..e81d0896aba 100644
--- a/libjava/gnu/xml/stream/XMLEventWriterImpl.h
+++ b/libjava/gnu/xml/stream/XMLEventWriterImpl.h
@@ -23,7 +23,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
       }
@@ -53,8 +53,8 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *);
   virtual void setDefaultNamespace(::java::lang::String *);
-  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();
 public: // actually protected
   ::javax::xml::stream::XMLStreamWriter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
 public:
diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h
index 0fb26669387..319c2c4a385 100644
--- a/libjava/gnu/xml/stream/XMLParser.h
+++ b/libjava/gnu/xml/stream/XMLParser.h
@@ -39,7 +39,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -64,12 +64,12 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
   virtual void close();
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
   virtual jint getAttributeCount();
   virtual ::java::lang::String * getAttributeLocalName(jint);
   virtual ::java::lang::String * getAttributeNamespace(jint);
   virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
   virtual ::java::lang::String * getAttributeType(jint);
 private:
   ::java::lang::String * getAttributeType(::java::lang::String *, ::java::lang::String *);
@@ -85,7 +85,7 @@ public:
   virtual jint getEventType();
   virtual ::java::lang::String * getLocalName();
   virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual jint getNamespaceCount();
   virtual ::java::lang::String * getNamespacePrefix(jint);
   virtual ::java::lang::String * getNamespaceURI();
diff --git a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
index ffd534947bc..d2059574347 100644
--- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
+++ b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
       }
@@ -89,8 +89,8 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *);
   virtual void setDefaultNamespace(::java::lang::String *);
-  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 ::java::lang::Object * getProperty(::java::lang::String *);
 private:
   void writeEncoded(::java::lang::String *, jboolean);
@@ -103,7 +103,7 @@ public: // actually protected
   ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
   ::java::lang::String * encoding;
   jboolean prefixDefaulting;
-  ::javax::xml::namespace::NamespaceContext * namespaceContext;
+  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
 private:
   ::java::util::LinkedList * elements;
   jboolean inStartElement;
diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h
index 20dadf66a6a..d82794dacb6 100644
--- a/libjava/gnu/xml/transform/AbstractNumberNode.h
+++ b/libjava/gnu/xml/transform/AbstractNumberNode.h
@@ -34,7 +34,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -57,7 +57,7 @@ class gnu::xml::transform::AbstractNumberNode : public ::gnu::xml::transform::Te
 
 public: // actually package-private
   AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *);
   virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *);
   static jboolean isAlphanumeric(jchar);
@@ -65,7 +65,7 @@ public: // actually package-private
   static ::java::lang::String * roman(jboolean, jint);
   virtual JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint) = 0;
 public:
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static const jint ALPHABETIC = 0;
diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.h b/libjava/gnu/xml/transform/ApplyImportsNode.h
index f9e19a61d0e..53f45e97532 100644
--- a/libjava/gnu/xml/transform/ApplyImportsNode.h
+++ b/libjava/gnu/xml/transform/ApplyImportsNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ApplyImportsNode : public ::gnu::xml::transform::Temp
 public: // actually package-private
   ApplyImportsNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ApplyTemplatesNode.h b/libjava/gnu/xml/transform/ApplyTemplatesNode.h
index 02f49a22b63..c25d2f53b51 100644
--- a/libjava/gnu/xml/transform/ApplyTemplatesNode.h
+++ b/libjava/gnu/xml/transform/ApplyTemplatesNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,15 +51,15 @@ class gnu::xml::transform::ApplyTemplatesNode : public ::gnu::xml::transform::Te
 {
 
 public: // actually package-private
-  ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, jboolean);
+  ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) select;
-  ::javax::xml::namespace::QName * mode;
+  ::javax::xml::namespace$::QName * mode;
   ::java::util::List * sortKeys;
   ::java::util::List * withParams;
   jboolean isDefault;
diff --git a/libjava/gnu/xml/transform/AttributeNode.h b/libjava/gnu/xml/transform/AttributeNode.h
index 80f6d3cc3d5..b83f7c8c0ef 100644
--- a/libjava/gnu/xml/transform/AttributeNode.h
+++ b/libjava/gnu/xml/transform/AttributeNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,11 +49,11 @@ class gnu::xml::transform::AttributeNode : public ::gnu::xml::transform::Templat
 public: // actually package-private
   AttributeNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::String * getPrefix(::java::lang::String *);
   ::java::lang::String * inventPrefix(::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
diff --git a/libjava/gnu/xml/transform/Bindings.h b/libjava/gnu/xml/transform/Bindings.h
index a54ab174e15..abbc8f0c6d6 100644
--- a/libjava/gnu/xml/transform/Bindings.h
+++ b/libjava/gnu/xml/transform/Bindings.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,12 +53,12 @@ public: // actually package-private
   virtual void push(jint);
   virtual void pop(jint);
 public:
-  virtual jboolean containsKey(::javax::xml::namespace::QName *, jint);
-  virtual ::java::lang::Object * get(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  virtual jboolean containsKey(::javax::xml::namespace$::QName *, jint);
+  virtual ::java::lang::Object * get(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
 public: // actually package-private
-  virtual void set(::javax::xml::namespace::QName *, ::java::lang::Object *, jint);
+  virtual void set(::javax::xml::namespace$::QName *, ::java::lang::Object *, jint);
 public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *);
+  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static const jint VARIABLE = 0;
diff --git a/libjava/gnu/xml/transform/CallTemplateNode.h b/libjava/gnu/xml/transform/CallTemplateNode.h
index f7d32ade246..03b2d179db3 100644
--- a/libjava/gnu/xml/transform/CallTemplateNode.h
+++ b/libjava/gnu/xml/transform/CallTemplateNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -47,14 +47,14 @@ class gnu::xml::transform::CallTemplateNode : public ::gnu::xml::transform::Temp
 {
 
 public: // actually package-private
-  CallTemplateNode(::javax::xml::namespace::QName *, ::java::util::List *);
+  CallTemplateNode(::javax::xml::namespace$::QName *, ::java::util::List *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::java::util::List * withParams;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ChooseNode.h b/libjava/gnu/xml/transform/ChooseNode.h
index 88574784fef..33519454be9 100644
--- a/libjava/gnu/xml/transform/ChooseNode.h
+++ b/libjava/gnu/xml/transform/ChooseNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ChooseNode : public ::gnu::xml::transform::TemplateNo
 public: // actually package-private
   ChooseNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/CommentNode.h b/libjava/gnu/xml/transform/CommentNode.h
index 2f04431d0d2..78b6d184386 100644
--- a/libjava/gnu/xml/transform/CommentNode.h
+++ b/libjava/gnu/xml/transform/CommentNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::CommentNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   CommentNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/CopyNode.h b/libjava/gnu/xml/transform/CopyNode.h
index a57c004d321..e724dbbe1f9 100644
--- a/libjava/gnu/xml/transform/CopyNode.h
+++ b/libjava/gnu/xml/transform/CopyNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,8 +49,8 @@ class gnu::xml::transform::CopyNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   CopyNode(::java::lang::String *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/CopyOfNode.h b/libjava/gnu/xml/transform/CopyOfNode.h
index f33944630d6..4bf660768c0 100644
--- a/libjava/gnu/xml/transform/CopyOfNode.h
+++ b/libjava/gnu/xml/transform/CopyOfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::CopyOfNode : public ::gnu::xml::transform::TemplateNo
 public: // actually package-private
   CopyOfNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/CurrentFunction.h b/libjava/gnu/xml/transform/CurrentFunction.h
index dee45ec7b45..118bfe54fd5 100644
--- a/libjava/gnu/xml/transform/CurrentFunction.h
+++ b/libjava/gnu/xml/transform/CurrentFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   void setArguments(::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
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
diff --git a/libjava/gnu/xml/transform/DocumentFunction.h b/libjava/gnu/xml/transform/DocumentFunction.h
index a599fc44b0e..88c31dcfa97 100644
--- a/libjava/gnu/xml/transform/DocumentFunction.h
+++ b/libjava/gnu/xml/transform/DocumentFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -59,7 +59,7 @@ public: // actually package-private
   ::java::util::Collection * document(::java::lang::String *, ::java::lang::String *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
   ::org::w3c::dom::Node * base;
diff --git a/libjava/gnu/xml/transform/ElementAvailableFunction.h b/libjava/gnu/xml/transform/ElementAvailableFunction.h
index 0d25fe354d9..21a828abe2c 100644
--- a/libjava/gnu/xml/transform/ElementAvailableFunction.h
+++ b/libjava/gnu/xml/transform/ElementAvailableFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -50,17 +50,17 @@ class gnu::xml::transform::ElementAvailableFunction : public ::gnu::xml::xpath::
 {
 
 public: // actually package-private
-  ElementAvailableFunction(::javax::xml::namespace::NamespaceContext *);
+  ElementAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
 public:
   virtual ::java::lang::Object * evaluate(::java::util::List *);
   virtual void setArguments(::java::util::List *);
   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
   static ::java::util::Collection * elements;
-  ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
+  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
   ::java::util::List * args;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ElementNode.h b/libjava/gnu/xml/transform/ElementNode.h
index 73d0f0fb216..b086d2ad582 100644
--- a/libjava/gnu/xml/transform/ElementNode.h
+++ b/libjava/gnu/xml/transform/ElementNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,11 +49,11 @@ class gnu::xml::transform::ElementNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ElementNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::String * getPrefix(::java::lang::String *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
+  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
diff --git a/libjava/gnu/xml/transform/ForEachNode.h b/libjava/gnu/xml/transform/ForEachNode.h
index 1cb11affc92..7b251d39b44 100644
--- a/libjava/gnu/xml/transform/ForEachNode.h
+++ b/libjava/gnu/xml/transform/ForEachNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::ForEachNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ForEachNode(::gnu::xml::xpath::Expr *, ::java::util::List *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.h b/libjava/gnu/xml/transform/FormatNumberFunction.h
index 417e8973805..634dc643a32 100644
--- a/libjava/gnu/xml/transform/FormatNumberFunction.h
+++ b/libjava/gnu/xml/transform/FormatNumberFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   void setArguments(::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 *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
   ::java::util::List * args;
diff --git a/libjava/gnu/xml/transform/FunctionAvailableFunction.h b/libjava/gnu/xml/transform/FunctionAvailableFunction.h
index b900a1b7a31..b34bfb0ad35 100644
--- a/libjava/gnu/xml/transform/FunctionAvailableFunction.h
+++ b/libjava/gnu/xml/transform/FunctionAvailableFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -50,18 +50,18 @@ class gnu::xml::transform::FunctionAvailableFunction : public ::gnu::xml::xpath:
 {
 
 public: // actually package-private
-  FunctionAvailableFunction(::javax::xml::namespace::NamespaceContext *);
+  FunctionAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
 public:
   virtual ::java::lang::Object * evaluate(::java::util::List *);
   virtual void setArguments(::java::util::List *);
   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
   static ::java::util::Collection * xsltFunctions;
   static ::java::util::Collection * xpathFunctions;
-  ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
+  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
   ::java::util::List * args;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/GenerateIdFunction.h b/libjava/gnu/xml/transform/GenerateIdFunction.h
index 8b1de4a182c..fe43452635d 100644
--- a/libjava/gnu/xml/transform/GenerateIdFunction.h
+++ b/libjava/gnu/xml/transform/GenerateIdFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,7 +55,7 @@ public:
   void setArguments(::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 *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/IfNode.h b/libjava/gnu/xml/transform/IfNode.h
index dff1c470ace..357da0d1903 100644
--- a/libjava/gnu/xml/transform/IfNode.h
+++ b/libjava/gnu/xml/transform/IfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::IfNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   IfNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) test;
diff --git a/libjava/gnu/xml/transform/Key.h b/libjava/gnu/xml/transform/Key.h
index 8588b2ffea4..08ff987acd5 100644
--- a/libjava/gnu/xml/transform/Key.h
+++ b/libjava/gnu/xml/transform/Key.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -41,9 +41,9 @@ class gnu::xml::transform::Key : public ::java::lang::Object
 {
 
 public: // actually package-private
-  Key(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *);
+  Key(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *);
   virtual ::gnu::xml::transform::Key * clone(::gnu::xml::transform::Stylesheet *);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   ::gnu::xml::xpath::Pattern * match;
   ::gnu::xml::xpath::Expr * use;
 public:
diff --git a/libjava/gnu/xml/transform/KeyFunction.h b/libjava/gnu/xml/transform/KeyFunction.h
index d9185e38020..7da94b1d597 100644
--- a/libjava/gnu/xml/transform/KeyFunction.h
+++ b/libjava/gnu/xml/transform/KeyFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -61,7 +61,7 @@ public: // actually package-private
   void addKeyNodeIfMatch(::org::w3c::dom::Node *, ::java::util::Collection *, ::java::lang::String *, ::java::util::Collection *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) stylesheet;
   ::java::util::List * args;
diff --git a/libjava/gnu/xml/transform/LiteralNode.h b/libjava/gnu/xml/transform/LiteralNode.h
index 056f5f1124f..c314eae2583 100644
--- a/libjava/gnu/xml/transform/LiteralNode.h
+++ b/libjava/gnu/xml/transform/LiteralNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::LiteralNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   LiteralNode(::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/MessageNode.h b/libjava/gnu/xml/transform/MessageNode.h
index 06fda75e92e..ebffd3d497a 100644
--- a/libjava/gnu/xml/transform/MessageNode.h
+++ b/libjava/gnu/xml/transform/MessageNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::MessageNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   MessageNode(jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/OtherwiseNode.h b/libjava/gnu/xml/transform/OtherwiseNode.h
index ecd01817185..2a067a548b9 100644
--- a/libjava/gnu/xml/transform/OtherwiseNode.h
+++ b/libjava/gnu/xml/transform/OtherwiseNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::OtherwiseNode : public ::gnu::xml::transform::Templat
 public: // actually package-private
   OtherwiseNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h
index aebd3e05054..786be5aa824 100644
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ b/libjava/gnu/xml/transform/ParameterNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,12 +51,12 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat
 {
 
 public: // actually package-private
-  ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint);
+  ParameterNode(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *, jint);
   ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *);
   ::java::lang::String * toString();
 public: // actually package-private
@@ -64,7 +64,7 @@ public: // actually package-private
 public:
   jint compareTo(::java::lang::Object *);
 public: // actually package-private
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::gnu::xml::xpath::Expr * select;
   jint type;
 public:
diff --git a/libjava/gnu/xml/transform/ProcessingInstructionNode.h b/libjava/gnu/xml/transform/ProcessingInstructionNode.h
index f8339159386..35bae5f7802 100644
--- a/libjava/gnu/xml/transform/ProcessingInstructionNode.h
+++ b/libjava/gnu/xml/transform/ProcessingInstructionNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ProcessingInstructionNode : public ::gnu::xml::transf
 public: // actually package-private
   ProcessingInstructionNode(::java::lang::String *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h
index b35aa5b12c9..a8e0a294222 100644
--- a/libjava/gnu/xml/transform/SortKey.h
+++ b/libjava/gnu/xml/transform/SortKey.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,8 +53,8 @@ class gnu::xml::transform::SortKey : public ::java::lang::Object
 public: // actually package-private
   SortKey(::gnu::xml::xpath::Expr *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *);
   ::java::lang::String * key(::org::w3c::dom::Node *);
-  void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  jboolean references(::javax::xml::namespace::QName *);
+  void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *);
 private:
   ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *);
diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h
index 8bfebcc05c9..69ceaa82257 100644
--- a/libjava/gnu/xml/transform/Stylesheet.h
+++ b/libjava/gnu/xml/transform/Stylesheet.h
@@ -33,7 +33,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -74,9 +74,9 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
 public: // actually package-private
-  virtual ::javax::xml::namespace::QName * getQName(::java::lang::String *);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jboolean);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::javax::xml::namespace::QName *);
+  virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *);
+  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jboolean);
+  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::javax::xml::namespace$::QName *);
   virtual ::gnu::xml::transform::Template * parseTemplate(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
   virtual void parseOutput(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
   virtual void parseKey(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
@@ -93,7 +93,7 @@ public: // actually package-private
   virtual ::gnu::xml::transform::TemplateNode * parseAttributeValueTemplate(::java::lang::String *, ::org::w3c::dom::Node *);
   virtual jboolean isPreserved(::org::w3c::dom::Text *, jboolean);
 public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint);
+  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint);
 public: // actually package-private
   virtual ::gnu::xml::transform::TemplateNode * parseApplyTemplates(::org::w3c::dom::Node *);
   virtual ::gnu::xml::transform::TemplateNode * parseCallTemplate(::org::w3c::dom::Node *);
diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.h b/libjava/gnu/xml/transform/SystemPropertyFunction.h
index dbbdc2d36f2..e1f16d9ceaf 100644
--- a/libjava/gnu/xml/transform/SystemPropertyFunction.h
+++ b/libjava/gnu/xml/transform/SystemPropertyFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,10 +55,10 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
 public: // actually package-private
-  ::java::lang::Object * systemProperty(::javax::xml::namespace::QName *);
+  ::java::lang::Object * systemProperty(::javax::xml::namespace$::QName *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/Template.h b/libjava/gnu/xml/transform/Template.h
index 3b26715d785..018beacfeeb 100644
--- a/libjava/gnu/xml/transform/Template.h
+++ b/libjava/gnu/xml/transform/Template.h
@@ -31,7 +31,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,31 +53,31 @@ class gnu::xml::transform::Template : public ::java::lang::Object
 {
 
 public: // actually package-private
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace::QName *);
+  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *);
 private:
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace::QName *, jboolean);
+  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace$::QName *, jboolean);
 public: // actually package-private
   virtual ::gnu::xml::transform::Template * clone(::gnu::xml::transform::Stylesheet *);
 public:
   virtual jint compareTo(::java::lang::Object *);
 public: // actually package-private
   virtual ::gnu::xml::xpath::Test * getNodeTest(::gnu::xml::xpath::Expr *);
-  virtual jboolean matches(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *);
-  virtual jboolean matches(::javax::xml::namespace::QName *);
+  virtual jboolean matches(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
+  virtual jboolean matches(::javax::xml::namespace$::QName *);
   virtual jboolean imports(::gnu::xml::transform::Template *);
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   virtual ::java::lang::String * toString();
 public: // actually package-private
   virtual void list(::java::io::PrintStream *);
   static jdouble DEFAULT_PRIORITY;
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stylesheet;
-  ::javax::xml::namespace::QName * name;
+  ::javax::xml::namespace$::QName * name;
   ::gnu::xml::xpath::Pattern * match;
   ::gnu::xml::transform::TemplateNode * node;
   jdouble priority;
   jint precedence;
-  ::javax::xml::namespace::QName * mode;
+  ::javax::xml::namespace$::QName * mode;
   jboolean isAnyNode;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/TemplateNode.h b/libjava/gnu/xml/transform/TemplateNode.h
index b5ecbc81753..354ff78c834 100644
--- a/libjava/gnu/xml/transform/TemplateNode.h
+++ b/libjava/gnu/xml/transform/TemplateNode.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -47,14 +47,14 @@ class gnu::xml::transform::TemplateNode : public ::java::lang::Object
 
 public: // actually package-private
   TemplateNode();
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
+  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
   virtual ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *) = 0;
 public:
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   virtual void list(jint, ::java::io::PrintStream *, jboolean);
-  virtual jboolean hasParam(::javax::xml::namespace::QName *);
+  virtual jboolean hasParam(::javax::xml::namespace$::QName *);
   static ::java::util::Comparator * documentOrderComparator;
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
   ::gnu::xml::transform::TemplateNode * next;
diff --git a/libjava/gnu/xml/transform/TextNode.h b/libjava/gnu/xml/transform/TextNode.h
index a78bc1cd3f0..9a832d1c1f4 100644
--- a/libjava/gnu/xml/transform/TextNode.h
+++ b/libjava/gnu/xml/transform/TextNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::TextNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   TextNode(jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/TransformerImpl.h b/libjava/gnu/xml/transform/TransformerImpl.h
index 47c1d9a9f35..9d10bd25e6f 100644
--- a/libjava/gnu/xml/transform/TransformerImpl.h
+++ b/libjava/gnu/xml/transform/TransformerImpl.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -86,7 +86,7 @@ public:
 public: // actually package-private
   virtual void reindent(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, jint);
   virtual void convertCdataSectionElements(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, ::java::util::List *);
-  virtual jboolean match(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *);
+  virtual jboolean match(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) factory;
   ::gnu::xml::transform::Stylesheet * stylesheet;
   ::javax::xml::transform::URIResolver * uriResolver;
diff --git a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
index c1b94c9466b..646bb3b7b1a 100644
--- a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
+++ b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,7 +55,7 @@ public:
   void setArguments(::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 *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/ValueOfNode.h b/libjava/gnu/xml/transform/ValueOfNode.h
index cfd13176529..30ed40daae4 100644
--- a/libjava/gnu/xml/transform/ValueOfNode.h
+++ b/libjava/gnu/xml/transform/ValueOfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::ValueOfNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ValueOfNode(::gnu::xml::xpath::Expr *, jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/WhenNode.h b/libjava/gnu/xml/transform/WhenNode.h
index c904902c3b6..835b3827720 100644
--- a/libjava/gnu/xml/transform/WhenNode.h
+++ b/libjava/gnu/xml/transform/WhenNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::WhenNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   WhenNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  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::transform::TemplateNode)))) test;
diff --git a/libjava/gnu/xml/transform/WithParam.h b/libjava/gnu/xml/transform/WithParam.h
index c5882691aeb..1d50e255189 100644
--- a/libjava/gnu/xml/transform/WithParam.h
+++ b/libjava/gnu/xml/transform/WithParam.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,12 +51,12 @@ class gnu::xml::transform::WithParam : public ::java::lang::Object
 {
 
 public: // actually package-private
-  WithParam(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *);
-  WithParam(::javax::xml::namespace::QName *, ::gnu::xml::transform::TemplateNode *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *);
+  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::transform::TemplateNode *);
+  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::transform::WithParam * clone(::gnu::xml::transform::Stylesheet *);
-  jboolean references(::javax::xml::namespace::QName *);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  jboolean references(::javax::xml::namespace$::QName *);
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   ::gnu::xml::xpath::Expr * select;
   ::gnu::xml::transform::TemplateNode * content;
 public:
diff --git a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h b/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
index 805e1ae5884..29b46ef06dd 100644
--- a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
+++ b/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,9 +50,9 @@ class gnu::xml::validation::datatype::AtomicSimpleType : public ::gnu::xml::vali
 {
 
 public:
-  AtomicSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
+  AtomicSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
 public: // actually package-private
-  AtomicSimpleType(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *);
+  AtomicSimpleType(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *);
 public:
   virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/validation/datatype/ListSimpleType.h b/libjava/gnu/xml/validation/datatype/ListSimpleType.h
index b8add0fb397..965b8643129 100644
--- a/libjava/gnu/xml/validation/datatype/ListSimpleType.h
+++ b/libjava/gnu/xml/validation/datatype/ListSimpleType.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::ListSimpleType : public ::gnu::xml::valida
 {
 
 public:
-  ListSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *);
+  ListSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *);
   virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
   ::gnu::xml::validation::datatype::SimpleType * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) itemType;
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/validation/datatype/SimpleType.h b/libjava/gnu/xml/validation/datatype/SimpleType.h
index fcdaa098c9f..2827d89f80a 100644
--- a/libjava/gnu/xml/validation/datatype/SimpleType.h
+++ b/libjava/gnu/xml/validation/datatype/SimpleType.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::SimpleType : public ::gnu::xml::validation
 {
 
 public:
-  SimpleType(::javax::xml::namespace::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
+  SimpleType(::javax::xml::namespace$::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
   virtual jboolean isValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
   virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
 private:
diff --git a/libjava/gnu/xml/validation/datatype/Type.h b/libjava/gnu/xml/validation/datatype/Type.h
index 17979387cc5..7cf557bb02a 100644
--- a/libjava/gnu/xml/validation/datatype/Type.h
+++ b/libjava/gnu/xml/validation/datatype/Type.h
@@ -26,7 +26,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -38,9 +38,9 @@ class gnu::xml::validation::datatype::Type : public ::java::lang::Object
 {
 
 public:
-  Type(::javax::xml::namespace::QName *);
+  Type(::javax::xml::namespace$::QName *);
   static ::gnu::xml::validation::datatype::Type * ANY_TYPE;
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h b/libjava/gnu/xml/validation/datatype/UnionSimpleType.h
index b0b27daaa30..db8c265d842 100644
--- a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h
+++ b/libjava/gnu/xml/validation/datatype/UnionSimpleType.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::UnionSimpleType : public ::gnu::xml::valid
 {
 
 public:
-  UnionSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *);
+  UnionSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *);
   virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) memberTypes;
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h b/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
index 4465791c0a8..5b7d1fcb0b4 100644
--- a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
+++ b/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
@@ -31,7 +31,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -43,14 +43,14 @@ class gnu::xml::validation::xmlschema::AttributeDeclaration : public ::java::lan
 {
 
 public: // actually package-private
-  AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
+  AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
   static const jint NONE = 0;
   static const jint DEFAULT = 1;
   static const jint FIXED = 2;
   jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) scope;
   jint type;
   ::java::lang::String * value;
-  ::javax::xml::namespace::QName * name;
+  ::javax::xml::namespace$::QName * name;
   ::gnu::xml::validation::datatype::SimpleType * datatype;
   ::gnu::xml::validation::datatype::Annotation * annotation;
 public:
diff --git a/libjava/gnu/xml/validation/xmlschema/ComplexType.h b/libjava/gnu/xml/validation/xmlschema/ComplexType.h
index 189a0757c79..170ab9db98f 100644
--- a/libjava/gnu/xml/validation/xmlschema/ComplexType.h
+++ b/libjava/gnu/xml/validation/xmlschema/ComplexType.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -39,8 +39,8 @@ class gnu::xml::validation::xmlschema::ComplexType : public ::gnu::xml::validati
 {
 
 public: // actually package-private
-  ComplexType(::javax::xml::namespace::QName *, jboolean, jint, jint);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType;
+  ComplexType(::javax::xml::namespace$::QName *, jboolean, jint, jint);
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType;
   jint derivationMethod;
   jint finality;
   jboolean isAbstract;
diff --git a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h b/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
index 0233bfc095a..67e7d863e1e 100644
--- a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
+++ b/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
@@ -31,7 +31,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -43,15 +43,15 @@ class gnu::xml::validation::xmlschema::ElementDeclaration : public ::java::lang:
 {
 
 public: // actually package-private
-  ElementDeclaration(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace::QName *, jint, jint, jboolean);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ElementDeclaration(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace$::QName *, jint, jint, jboolean);
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   ::gnu::xml::validation::datatype::Type * datatype;
   jint scope;
   ::gnu::xml::validation::xmlschema::ElementDeclaration * parent;
   jint type;
   ::java::lang::String * value;
   jboolean nillable;
-  ::javax::xml::namespace::QName * substitutionGroup;
+  ::javax::xml::namespace$::QName * substitutionGroup;
   jint substitutionGroupExclusions;
   jint disallowedSubstitutions;
   jboolean isAbstract;
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
index 2d208afd61f..ed1bc80dc08 100644
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
+++ b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
@@ -36,7 +36,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -77,7 +77,7 @@ public: // actually package-private
   virtual jint parseComplexTypeBlockSet(::java::lang::String *);
   virtual ::java::lang::Object * parseElement(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
   virtual ::java::lang::Integer * getOccurrence(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace::QName *);
+  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace$::QName *);
   virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::org::w3c::dom::Node *);
   virtual ::gnu::xml::validation::datatype::Type * parseComplexType(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
   virtual void parseSimpleContent(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
@@ -87,7 +87,7 @@ public: // actually package-private
   virtual ::gnu::xml::validation::datatype::Annotation * parseAnnotation(::org::w3c::dom::Node *);
 private:
   static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
-  static ::javax::xml::namespace::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
+  static ::javax::xml::namespace$::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
 public: // actually package-private
   ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schema;
   ::org::relaxng::datatype::DatatypeLibrary * typeLibrary;
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: