Index: javax/net/ssl/TrustManagerFactory$1.h
===================================================================
--- javax/net/ssl/TrustManagerFactory$1.h	(revision 155473)
+++ javax/net/ssl/TrustManagerFactory$1.h	(working copy)
@@ -27,7 +27,7 @@
 public: // actually package-private
   TrustManagerFactory$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: javax/net/ssl/KeyManagerFactory$1.h
===================================================================
--- javax/net/ssl/KeyManagerFactory$1.h	(revision 155473)
+++ javax/net/ssl/KeyManagerFactory$1.h	(working copy)
@@ -27,7 +27,7 @@
 public: // actually package-private
   KeyManagerFactory$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/JProgressBar$1.h
===================================================================
--- javax/swing/JProgressBar$1.h	(revision 155473)
+++ javax/swing/JProgressBar$1.h	(working copy)
@@ -29,7 +29,7 @@
 public: // actually package-private
   JProgressBar$1(::javax::swing::JProgressBar *);
 public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
 public: // actually package-private
   ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/Timer$1.h
===================================================================
--- javax/swing/Timer$1.h	(revision 155473)
+++ javax/swing/Timer$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   Timer$1(::javax::swing::Timer *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/JMenuItem$1.h
===================================================================
--- javax/swing/JMenuItem$1.h	(revision 155473)
+++ javax/swing/JMenuItem$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   JMenuItem$1(::javax::swing::JMenuItem *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/JComboBox$1.h
===================================================================
--- javax/swing/JComboBox$1.h	(revision 155473)
+++ javax/swing/JComboBox$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   JComboBox$1(::javax::swing::JComboBox *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/JEditorPane$1.h
===================================================================
--- javax/swing/JEditorPane$1.h	(revision 155473)
+++ javax/swing/JEditorPane$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   JEditorPane$1(::javax::swing::JEditorPane$PlainEditorKit *);
 public:
-  ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
 public: // actually package-private
   ::javax::swing::JEditorPane$PlainEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: javax/swing/ProgressMonitor$1.h
===================================================================
--- javax/swing/ProgressMonitor$1.h	(revision 155473)
+++ javax/swing/ProgressMonitor$1.h	(working copy)
@@ -35,7 +35,7 @@
 public: // actually package-private
   ProgressMonitor$1(::javax::swing::ProgressMonitor *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/LookAndFeel$1.h
===================================================================
--- javax/swing/LookAndFeel$1.h	(revision 155473)
+++ javax/swing/LookAndFeel$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   LookAndFeel$1(::java::net::URL *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 private:
   ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$file;
 public:
Index: javax/swing/JEditorPane$2.h
===================================================================
--- javax/swing/JEditorPane$2.h	(revision 155473)
+++ javax/swing/JEditorPane$2.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   JEditorPane$2(::javax::swing::JEditorPane$PageLoader *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::JEditorPane$PageLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: javax/swing/UIDefaults$1.h
===================================================================
--- javax/swing/UIDefaults$1.h	(revision 155473)
+++ javax/swing/UIDefaults$1.h	(working copy)
@@ -26,7 +26,7 @@
 public: // actually package-private
   UIDefaults$1(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 private:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$6.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$6.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$6.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$6(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSpinnerUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicSpinnerUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSpinnerUI$4.h	(working copy)
@@ -42,10 +42,10 @@
 public: // actually package-private
   BasicSpinnerUI$4(::javax::swing::plaf::basic::BasicSpinnerUI *);
 public:
-  void mousePressed(::java::awt::event::MouseEvent *);
-  void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
 public: // actually package-private
-  void decrement();
+  virtual void decrement();
   jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
   ::javax::swing::Timer * timer;
   ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
Index: javax/swing/plaf/basic/BasicScrollPaneUI$10.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$10.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$10.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$10(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicButtonListener$1.h
===================================================================
--- javax/swing/plaf/basic/BasicButtonListener$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicButtonListener$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicButtonListener$1(::javax::swing::plaf::basic::BasicButtonListener *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$3.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$3.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$3(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$6.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$6.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$6.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$6(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicIconFactory$1.h
===================================================================
--- javax/swing/plaf/basic/BasicIconFactory$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicIconFactory$1.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   BasicIconFactory$1();
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicScrollBarUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$3.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$3(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$7.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$7.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$7.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$7(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicDesktopIconUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicDesktopIconUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicDesktopIconUI$1.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicDesktopIconUI$1(::javax::swing::plaf::basic::BasicDesktopIconUI *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSliderUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$1(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSpinnerUI$5.h
===================================================================
--- javax/swing/plaf/basic/BasicSpinnerUI$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSpinnerUI$5.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSpinnerUI$5(::javax::swing::plaf::basic::BasicSpinnerUI$4 *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSpinnerUI$4 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: javax/swing/plaf/basic/BasicButtonListener$2.h
===================================================================
--- javax/swing/plaf/basic/BasicButtonListener$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicButtonListener$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicButtonListener$2(::javax::swing::plaf::basic::BasicButtonListener *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$4.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$4.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$4(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$7.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$7.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$7.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$7(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicIconFactory$2.h
===================================================================
--- javax/swing/plaf/basic/BasicIconFactory$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicIconFactory$2.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   BasicIconFactory$2();
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicScrollBarUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$4.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$4(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicTreeUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicTreeUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicTreeUI$1.h	(working copy)
@@ -39,9 +39,9 @@
 public: // actually package-private
   BasicTreeUI$1(::javax::swing::plaf::basic::BasicTreeUI *);
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$8.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$8.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$8.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$8(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSliderUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$2(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicDesktopIconUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicDesktopIconUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicDesktopIconUI$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicDesktopIconUI$2(::javax::swing::plaf::basic::BasicDesktopIconUI *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$5.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$5.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$5(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$8.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$8.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$8.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$8(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollBarUI$5.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$5.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$5(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$1(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSliderUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$3.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$3(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$6.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$6.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$6.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$6(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicTableHeaderUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicTableHeaderUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicTableHeaderUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicTableHeaderUI$1(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$1(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$9.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$9.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$9.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$9(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollBarUI$6.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$6.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$6.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$6(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$2(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicOptionPaneUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicOptionPaneUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicOptionPaneUI$1.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicOptionPaneUI$1();
 public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicSliderUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$4.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$4(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicDirectoryModel$1.h
===================================================================
--- javax/swing/plaf/basic/BasicDirectoryModel$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicDirectoryModel$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   BasicDirectoryModel$1(::javax::swing::plaf::basic::BasicDirectoryModel *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicDirectoryModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$7.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$7.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$7.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$7(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$2(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$3.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$3(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicOptionPaneUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicOptionPaneUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicOptionPaneUI$2.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicOptionPaneUI$2();
 public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicSpinnerUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicSpinnerUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSpinnerUI$1.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicSpinnerUI$1(::javax::swing::plaf::basic::BasicSpinnerUI *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSpinnerUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSliderUI$5.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$5.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$5(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$3.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$3(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicColorChooserUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicColorChooserUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicColorChooserUI$1.h	(working copy)
@@ -35,7 +35,7 @@
 public: // actually package-private
   BasicColorChooserUI$1(::javax::swing::plaf::basic::BasicColorChooserUI *);
 public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$4.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$4(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicOptionPaneUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicOptionPaneUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicOptionPaneUI$3.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicOptionPaneUI$3();
 public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicSpinnerUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicSpinnerUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSpinnerUI$2.h	(working copy)
@@ -42,10 +42,10 @@
 public: // actually package-private
   BasicSpinnerUI$2(::javax::swing::plaf::basic::BasicSpinnerUI *);
 public:
-  void mousePressed(::java::awt::event::MouseEvent *);
-  void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
 public: // actually package-private
-  void increment();
+  virtual void increment();
   jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
   ::javax::swing::Timer * timer;
   ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
Index: javax/swing/plaf/basic/BasicLookAndFeel$1.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$1(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSliderUI$6.h
===================================================================
--- javax/swing/plaf/basic/BasicSliderUI$6.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSliderUI$6.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSliderUI$6(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$4.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$4(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollBarUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$1(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicSplitPaneUI$5.h
===================================================================
--- javax/swing/plaf/basic/BasicSplitPaneUI$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSplitPaneUI$5.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSplitPaneUI$5(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicOptionPaneUI$4.h
===================================================================
--- javax/swing/plaf/basic/BasicOptionPaneUI$4.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicOptionPaneUI$4.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   BasicOptionPaneUI$4();
 public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/basic/BasicSpinnerUI$3.h
===================================================================
--- javax/swing/plaf/basic/BasicSpinnerUI$3.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicSpinnerUI$3.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicSpinnerUI$3(::javax::swing::plaf::basic::BasicSpinnerUI$2 *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicSpinnerUI$2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: javax/swing/plaf/basic/BasicLookAndFeel$2.h
===================================================================
--- javax/swing/plaf/basic/BasicLookAndFeel$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLookAndFeel$2.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   BasicLookAndFeel$2(::javax::swing::plaf::basic::BasicLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollPaneUI$5.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollPaneUI$5.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollPaneUI$5.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollPaneUI$5(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicLabelUI$1.h
===================================================================
--- javax/swing/plaf/basic/BasicLabelUI$1.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicLabelUI$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicLabelUI$1(::javax::swing::plaf::basic::BasicLabelUI *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/basic/BasicScrollBarUI$2.h
===================================================================
--- javax/swing/plaf/basic/BasicScrollBarUI$2.h	(revision 155473)
+++ javax/swing/plaf/basic/BasicScrollBarUI$2.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   BasicScrollBarUI$2(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
 public:
Index: javax/swing/plaf/metal/MetalIconFactory$2.h
===================================================================
--- javax/swing/plaf/metal/MetalIconFactory$2.h	(revision 155473)
+++ javax/swing/plaf/metal/MetalIconFactory$2.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   MetalIconFactory$2();
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/metal/MetalLookAndFeel$1.h
===================================================================
--- javax/swing/plaf/metal/MetalLookAndFeel$1.h	(revision 155473)
+++ javax/swing/plaf/metal/MetalLookAndFeel$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   MetalLookAndFeel$1(::javax::swing::plaf::metal::MetalLookAndFeel *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::plaf::metal::MetalLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/plaf/metal/MetalIconFactory$1.h
===================================================================
--- javax/swing/plaf/metal/MetalIconFactory$1.h	(revision 155473)
+++ javax/swing/plaf/metal/MetalIconFactory$1.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   MetalIconFactory$1();
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/metal/MetalIconFactory$3.h
===================================================================
--- javax/swing/plaf/metal/MetalIconFactory$3.h	(revision 155473)
+++ javax/swing/plaf/metal/MetalIconFactory$3.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   MetalIconFactory$3();
 public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/plaf/metal/MetalInternalFrameUI$1.h
===================================================================
--- javax/swing/plaf/metal/MetalInternalFrameUI$1.h	(revision 155473)
+++ javax/swing/plaf/metal/MetalInternalFrameUI$1.h	(working copy)
@@ -38,7 +38,7 @@
 public: // actually package-private
   MetalInternalFrameUI$1(::javax::swing::plaf::metal::MetalInternalFrameUI *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::plaf::metal::MetalInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/AbstractButton$1.h
===================================================================
--- javax/swing/AbstractButton$1.h	(revision 155473)
+++ javax/swing/AbstractButton$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   AbstractButton$1(::javax::swing::AbstractButton *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/Spring$1.h
===================================================================
--- javax/swing/Spring$1.h	(revision 155473)
+++ javax/swing/Spring$1.h	(working copy)
@@ -25,11 +25,11 @@
 public: // actually package-private
   Spring$1(jfloat, ::javax::swing::Spring *);
 public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
 private:
   jfloat __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$factor;
   ::javax::swing::Spring * val$spring;
Index: javax/swing/JTextField$1.h
===================================================================
--- javax/swing/JTextField$1.h	(revision 155473)
+++ javax/swing/JTextField$1.h	(working copy)
@@ -34,7 +34,7 @@
 public: // actually package-private
   JTextField$1(::java::lang::String *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
   static ::java::lang::Class class$;
 };
 
Index: javax/swing/UIDefaults$2.h
===================================================================
--- javax/swing/UIDefaults$2.h	(revision 155473)
+++ javax/swing/UIDefaults$2.h	(working copy)
@@ -26,7 +26,7 @@
 public: // actually package-private
   UIDefaults$2(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 private:
Index: javax/swing/JFileChooser$1.h
===================================================================
--- javax/swing/JFileChooser$1.h	(revision 155473)
+++ javax/swing/JFileChooser$1.h	(working copy)
@@ -35,7 +35,7 @@
 public: // actually package-private
   JFileChooser$1(::javax::swing::JFileChooser *);
 public:
-  void windowClosing(::java::awt::event::WindowEvent *);
+  virtual void windowClosing(::java::awt::event::WindowEvent *);
 public: // actually package-private
   ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
 public:
Index: javax/swing/JPopupMenu$1.h
===================================================================
--- javax/swing/JPopupMenu$1.h	(revision 155473)
+++ javax/swing/JPopupMenu$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   JPopupMenu$1(::javax::swing::JPopupMenu *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/Spring$2.h
===================================================================
--- javax/swing/Spring$2.h	(revision 155473)
+++ javax/swing/Spring$2.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   Spring$2(::java::awt::Component *);
 public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
 private:
   ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
 public:
Index: javax/swing/JTextField$2.h
===================================================================
--- javax/swing/JTextField$2.h	(revision 155473)
+++ javax/swing/JTextField$2.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   JTextField$2(::javax::swing::JTextField *);
 public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
 public: // actually package-private
   ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/UIDefaults$3.h
===================================================================
--- javax/swing/UIDefaults$3.h	(revision 155473)
+++ javax/swing/UIDefaults$3.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   UIDefaults$3(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 private:
Index: javax/swing/JList$1.h
===================================================================
--- javax/swing/JList$1.h	(revision 155473)
+++ javax/swing/JList$1.h	(working copy)
@@ -27,8 +27,8 @@
 public: // actually package-private
   JList$1(::javax::swing::JList *, JArray< ::java::lang::Object * > *);
 public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
 public: // actually package-private
   ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
 private:
Index: javax/swing/JPopupMenu$2.h
===================================================================
--- javax/swing/JPopupMenu$2.h	(revision 155473)
+++ javax/swing/JPopupMenu$2.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   JPopupMenu$2(::javax::swing::JPopupMenu *, jboolean);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: javax/swing/Spring$3.h
===================================================================
--- javax/swing/Spring$3.h	(revision 155473)
+++ javax/swing/Spring$3.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   Spring$3(::java::awt::Component *);
 public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
 private:
   ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
 public:
Index: javax/swing/UIDefaults$4.h
===================================================================
--- javax/swing/UIDefaults$4.h	(revision 155473)
+++ javax/swing/UIDefaults$4.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   UIDefaults$4(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
 public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
 public: // actually package-private
   ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 private:
Index: javax/swing/text/html/ImageView$1.h
===================================================================
--- javax/swing/text/html/ImageView$1.h	(revision 155473)
+++ javax/swing/text/html/ImageView$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   ImageView$1(::javax::swing::text::html::ImageView *, ::javax::swing::text::View *, jboolean, jboolean);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: javax/swing/text/html/parser/Entity$1.h
===================================================================
--- javax/swing/text/html/parser/Entity$1.h	(revision 155473)
+++ javax/swing/text/html/parser/Entity$1.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   Entity$1();
 public: // actually protected
-  void create();
+  virtual void create();
 public:
   static ::java::lang::Class class$;
 };
Index: javax/swing/text/html/parser/Element$1.h
===================================================================
--- javax/swing/text/html/parser/Element$1.h	(revision 155473)
+++ javax/swing/text/html/parser/Element$1.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   Element$1();
 public: // actually protected
-  void create();
+  virtual void create();
 public:
   static ::java::lang::Class class$;
 };
Index: javax/swing/text/html/parser/Parser$1.h
===================================================================
--- javax/swing/text/html/parser/Parser$1.h	(revision 155473)
+++ javax/swing/text/html/parser/Parser$1.h	(working copy)
@@ -39,19 +39,19 @@
 public: // actually package-private
   Parser$1(::javax::swing::text::html::parser::Parser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::Parser *);
 public: // actually protected
-  void handleComment(JArray< jchar > *);
-  void handleEOFInComment();
-  void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  void handleError(jint, ::java::lang::String *);
-  void handleText(JArray< jchar > *);
-  void handleTitle(JArray< jchar > *);
-  void markFirstTime(::javax::swing::text::html::parser::Element *);
-  void startTag(::javax::swing::text::html::parser::TagElement *);
-  void endTag(jboolean);
-  ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
-  ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEOFInComment();
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleText(JArray< jchar > *);
+  virtual void handleTitle(JArray< jchar > *);
+  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
+  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void endTag(jboolean);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
 public: // actually package-private
   ::javax::swing::text::html::parser::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
 private:
Index: javax/swing/text/html/parser/AttributeList$1.h
===================================================================
--- javax/swing/text/html/parser/AttributeList$1.h	(revision 155473)
+++ javax/swing/text/html/parser/AttributeList$1.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   AttributeList$1();
 public: // actually protected
-  void create();
+  virtual void create();
 public:
   static ::java::lang::Class class$;
 };
Index: javax/swing/text/html/FormView$1.h
===================================================================
--- javax/swing/text/html/FormView$1.h	(revision 155473)
+++ javax/swing/text/html/FormView$1.h	(working copy)
@@ -40,7 +40,7 @@
 public: // actually package-private
   FormView$1(::javax::swing::text::html::FormView$SubmitThread *, ::javax::swing::text::html::HTMLDocument *, ::javax::swing::JEditorPane *, ::java::lang::String *, ::java::net::URL *, ::java::lang::String *, ::java::net::URL *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::text::html::FormView$SubmitThread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 private:
Index: javax/swing/text/html/HTMLDocument$1.h
===================================================================
--- javax/swing/text/html/HTMLDocument$1.h	(revision 155473)
+++ javax/swing/text/html/HTMLDocument$1.h	(working copy)
@@ -33,8 +33,8 @@
 public: // actually package-private
   HTMLDocument$1(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
 public:
-  void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
+  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
 public: // actually package-private
   ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader)))) this$0;
 public:
Index: javax/swing/text/StyleContext$1.h
===================================================================
--- javax/swing/text/StyleContext$1.h	(revision 155473)
+++ javax/swing/text/StyleContext$1.h	(working copy)
@@ -28,8 +28,8 @@
 public: // actually package-private
   StyleContext$1(::javax::swing::text::StyleContext$SmallAttributeSet *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
   ::javax::swing::text::StyleContext$SmallAttributeSet * this$1;
Index: javax/swing/text/FieldView$1.h
===================================================================
--- javax/swing/text/FieldView$1.h	(revision 155473)
+++ javax/swing/text/FieldView$1.h	(working copy)
@@ -32,7 +32,7 @@
 public: // actually package-private
   FieldView$1(::javax::swing::text::FieldView *);
 public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
 public: // actually package-private
   ::javax::swing::text::FieldView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/text/EmptyAttributeSet$1.h
===================================================================
--- javax/swing/text/EmptyAttributeSet$1.h	(revision 155473)
+++ javax/swing/text/EmptyAttributeSet$1.h	(working copy)
@@ -28,8 +28,8 @@
 public: // actually package-private
   EmptyAttributeSet$1(::javax::swing::text::EmptyAttributeSet *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::javax::swing::text::EmptyAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/text/ComponentView$1.h
===================================================================
--- javax/swing/text/ComponentView$1.h	(revision 155473)
+++ javax/swing/text/ComponentView$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   ComponentView$1(::javax::swing::text::ComponentView *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::text::ComponentView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/JList$2.h
===================================================================
--- javax/swing/JList$2.h	(revision 155473)
+++ javax/swing/JList$2.h	(working copy)
@@ -25,8 +25,8 @@
 public: // actually package-private
   JList$2(::javax::swing::JList *, ::java::util::Vector *);
 public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
 public: // actually package-private
   ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
 private:
Index: javax/swing/JComponent$1.h
===================================================================
--- javax/swing/JComponent$1.h	(revision 155473)
+++ javax/swing/JComponent$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   JComponent$1(::javax::swing::JComponent *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
===================================================================
--- javax/swing/colorchooser/DefaultHSBChooserPanel$1.h	(revision 155473)
+++ javax/swing/colorchooser/DefaultHSBChooserPanel$1.h	(working copy)
@@ -36,8 +36,8 @@
 public: // actually package-private
   DefaultHSBChooserPanel$1(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
 public:
-  ::java::awt::Dimension * getPreferredSize();
-  void paint(::java::awt::Graphics *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void paint(::java::awt::Graphics *);
 public: // actually package-private
   ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
 public:
Index: javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
===================================================================
--- javax/swing/colorchooser/DefaultHSBChooserPanel$2.h	(revision 155473)
+++ javax/swing/colorchooser/DefaultHSBChooserPanel$2.h	(working copy)
@@ -36,8 +36,8 @@
 public: // actually package-private
   DefaultHSBChooserPanel$2(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
 public:
-  ::java::awt::Dimension * getPreferredSize();
-  void paint(::java::awt::Graphics *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void paint(::java::awt::Graphics *);
 public: // actually package-private
   ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
 public:
Index: javax/swing/JList$3.h
===================================================================
--- javax/swing/JList$3.h	(revision 155473)
+++ javax/swing/JList$3.h	(working copy)
@@ -25,8 +25,8 @@
 public: // actually package-private
   JList$3(::javax::swing::JList *, ::java::util::Vector *);
 public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
 public: // actually package-private
   ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
 private:
Index: javax/swing/JSlider$1.h
===================================================================
--- javax/swing/JSlider$1.h	(revision 155473)
+++ javax/swing/JSlider$1.h	(working copy)
@@ -29,7 +29,7 @@
 public: // actually package-private
   JSlider$1(::javax::swing::JSlider *);
 public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
 public: // actually package-private
   ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: javax/print/attribute/SetOfIntegerSyntax$1.h
===================================================================
--- javax/print/attribute/SetOfIntegerSyntax$1.h	(revision 155473)
+++ javax/print/attribute/SetOfIntegerSyntax$1.h	(working copy)
@@ -27,7 +27,7 @@
 public: // actually package-private
   SetOfIntegerSyntax$1();
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
   static ::java::lang::Class class$;
 };
 
Index: javax/xml/xpath/XPathFunctionResolver.h
===================================================================
--- javax/xml/xpath/XPathFunctionResolver.h	(revision 155473)
+++ javax/xml/xpath/XPathFunctionResolver.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -30,7 +30,7 @@
 {
 
 public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint) = 0;
+  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
Index: javax/xml/xpath/XPathVariableResolver.h
===================================================================
--- javax/xml/xpath/XPathVariableResolver.h	(revision 155473)
+++ javax/xml/xpath/XPathVariableResolver.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -29,7 +29,7 @@
 {
 
 public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *) = 0;
+  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
Index: javax/xml/xpath/XPathConstants.h
===================================================================
--- javax/xml/xpath/XPathConstants.h	(revision 155473)
+++ javax/xml/xpath/XPathConstants.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -30,11 +30,11 @@
 
   XPathConstants();
 public:
-  static ::javax::xml::namespace$::QName * NUMBER;
-  static ::javax::xml::namespace$::QName * STRING;
-  static ::javax::xml::namespace$::QName * BOOLEAN;
-  static ::javax::xml::namespace$::QName * NODESET;
-  static ::javax::xml::namespace$::QName * NODE;
+  static ::javax::xml::namespace::QName * NUMBER;
+  static ::javax::xml::namespace::QName * STRING;
+  static ::javax::xml::namespace::QName * BOOLEAN;
+  static ::javax::xml::namespace::QName * NODESET;
+  static ::javax::xml::namespace::QName * NODE;
   static ::java::lang::String * DOM_OBJECT_MODEL;
   static ::java::lang::Class class$;
 };
Index: javax/xml/xpath/XPath.h
===================================================================
--- javax/xml/xpath/XPath.h	(revision 155473)
+++ javax/xml/xpath/XPath.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -48,12 +48,12 @@
   virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver() = 0;
   virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0;
   virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver() = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
+  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
   virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0;
+  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace::QName *) = 0;
   virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0;
+  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0;
   virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/xpath/XPathExpression.h
===================================================================
--- javax/xml/xpath/XPathExpression.h	(revision 155473)
+++ javax/xml/xpath/XPathExpression.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -39,9 +39,9 @@
 {
 
 public:
-  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0;
+  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace::QName *) = 0;
   virtual ::java::lang::String * evaluate(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0;
+  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0;
   virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/datatype/Duration.h
===================================================================
--- javax/xml/datatype/Duration.h	(revision 155473)
+++ javax/xml/datatype/Duration.h	(working copy)
@@ -25,7 +25,7 @@
           class DatatypeConstants$Field;
           class Duration;
       }
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -38,7 +38,7 @@
 
 public:
   Duration();
-  virtual ::javax::xml::namespace$::QName * getXMLSchemaType();
+  virtual ::javax::xml::namespace::QName * getXMLSchemaType();
   virtual jint getSign() = 0;
   virtual jint getYears();
   virtual jint getMonths();
Index: javax/xml/datatype/DatatypeConstants.h
===================================================================
--- javax/xml/datatype/DatatypeConstants.h	(revision 155473)
+++ javax/xml/datatype/DatatypeConstants.h	(working copy)
@@ -18,7 +18,7 @@
           class DatatypeConstants;
           class DatatypeConstants$Field;
       }
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -54,17 +54,17 @@
   static ::javax::xml::datatype::DatatypeConstants$Field * HOURS;
   static ::javax::xml::datatype::DatatypeConstants$Field * MINUTES;
   static ::javax::xml::datatype::DatatypeConstants$Field * SECONDS;
-  static ::javax::xml::namespace$::QName * DATETIME;
-  static ::javax::xml::namespace$::QName * TIME;
-  static ::javax::xml::namespace$::QName * DATE;
-  static ::javax::xml::namespace$::QName * GYEARMONTH;
-  static ::javax::xml::namespace$::QName * GMONTHDAY;
-  static ::javax::xml::namespace$::QName * GYEAR;
-  static ::javax::xml::namespace$::QName * GMONTH;
-  static ::javax::xml::namespace$::QName * GDAY;
-  static ::javax::xml::namespace$::QName * DURATION;
-  static ::javax::xml::namespace$::QName * DURATION_DAYTIME;
-  static ::javax::xml::namespace$::QName * DURATION_YEARMONTH;
+  static ::javax::xml::namespace::QName * DATETIME;
+  static ::javax::xml::namespace::QName * TIME;
+  static ::javax::xml::namespace::QName * DATE;
+  static ::javax::xml::namespace::QName * GYEARMONTH;
+  static ::javax::xml::namespace::QName * GMONTHDAY;
+  static ::javax::xml::namespace::QName * GYEAR;
+  static ::javax::xml::namespace::QName * GMONTH;
+  static ::javax::xml::namespace::QName * GDAY;
+  static ::javax::xml::namespace::QName * DURATION;
+  static ::javax::xml::namespace::QName * DURATION_DAYTIME;
+  static ::javax::xml::namespace::QName * DURATION_YEARMONTH;
   static const jint MAX_TIMEZONE_OFFSET = -840;
   static const jint MIN_TIMEZONE_OFFSET = 840;
   static ::java::lang::Class class$;
Index: javax/xml/datatype/XMLGregorianCalendar.h
===================================================================
--- javax/xml/datatype/XMLGregorianCalendar.h	(revision 155473)
+++ javax/xml/datatype/XMLGregorianCalendar.h	(working copy)
@@ -26,7 +26,7 @@
           class Duration;
           class XMLGregorianCalendar;
       }
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -70,7 +70,7 @@
   virtual jboolean equals(::java::lang::Object *);
   virtual jint hashCode();
   virtual ::java::lang::String * toXMLFormat() = 0;
-  virtual ::javax::xml::namespace$::QName * getXMLSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getXMLSchemaType() = 0;
   virtual ::java::lang::String * toString();
   virtual jboolean isValid() = 0;
   virtual void add(::javax::xml::datatype::Duration *) = 0;
Index: javax/xml/stream/XMLEventFactory.h
===================================================================
--- javax/xml/stream/XMLEventFactory.h	(revision 155473)
+++ javax/xml/stream/XMLEventFactory.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -57,14 +57,14 @@
   virtual void setLocation(::javax::xml::stream::Location *) = 0;
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *) = 0;
+  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
+  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  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 *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *) = 0;
+  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 *) = 0;
+  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *) = 0;
Index: javax/xml/stream/XMLEventWriter.h
===================================================================
--- javax/xml/stream/XMLEventWriter.h	(revision 155473)
+++ javax/xml/stream/XMLEventWriter.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
       }
@@ -41,8 +41,8 @@
   virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
   virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
+  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
Index: javax/xml/stream/XMLStreamReader.h
===================================================================
--- javax/xml/stream/XMLStreamReader.h	(revision 155473)
+++ javax/xml/stream/XMLStreamReader.h	(working copy)
@@ -15,7 +15,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -47,7 +47,7 @@
   virtual jboolean isWhiteSpace() = 0;
   virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0;
   virtual jint getAttributeCount() = 0;
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint) = 0;
+  virtual ::javax::xml::namespace::QName * getAttributeName(jint) = 0;
   virtual ::java::lang::String * getAttributeNamespace(jint) = 0;
   virtual ::java::lang::String * getAttributeLocalName(jint) = 0;
   virtual ::java::lang::String * getAttributePrefix(jint) = 0;
@@ -57,7 +57,7 @@
   virtual jint getNamespaceCount() = 0;
   virtual ::java::lang::String * getNamespacePrefix(jint) = 0;
   virtual ::java::lang::String * getNamespaceURI(jint) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
   virtual jint getEventType() = 0;
   virtual ::java::lang::String * getText() = 0;
   virtual JArray< jchar > * getTextCharacters() = 0;
@@ -67,7 +67,7 @@
   virtual ::java::lang::String * getEncoding() = 0;
   virtual jboolean hasText() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
+  virtual ::javax::xml::namespace::QName * getName() = 0;
   virtual ::java::lang::String * getLocalName() = 0;
   virtual jboolean hasName() = 0;
   virtual ::java::lang::String * getNamespaceURI() = 0;
Index: javax/xml/stream/XMLStreamWriter.h
===================================================================
--- javax/xml/stream/XMLStreamWriter.h	(revision 155473)
+++ javax/xml/stream/XMLStreamWriter.h	(working copy)
@@ -15,7 +15,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
       }
@@ -60,8 +60,8 @@
   virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
   virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
+  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
   virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/DTD.h
===================================================================
--- javax/xml/stream/events/DTD.h	(revision 155473)
+++ javax/xml/stream/events/DTD.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -54,7 +54,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/EntityReference.h
===================================================================
--- javax/xml/stream/events/EntityReference.h	(revision 155473)
+++ javax/xml/stream/events/EntityReference.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/Namespace.h
===================================================================
--- javax/xml/stream/events/Namespace.h	(revision 155473)
+++ javax/xml/stream/events/Namespace.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/StartDocument.h
===================================================================
--- javax/xml/stream/events/StartDocument.h	(revision 155473)
+++ javax/xml/stream/events/StartDocument.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -56,7 +56,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/ProcessingInstruction.h
===================================================================
--- javax/xml/stream/events/ProcessingInstruction.h	(revision 155473)
+++ javax/xml/stream/events/ProcessingInstruction.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -52,7 +52,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/Characters.h
===================================================================
--- javax/xml/stream/events/Characters.h	(revision 155473)
+++ javax/xml/stream/events/Characters.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/EndElement.h
===================================================================
--- javax/xml/stream/events/EndElement.h	(revision 155473)
+++ javax/xml/stream/events/EndElement.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -35,7 +35,7 @@
 {
 
 public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
+  virtual ::javax::xml::namespace::QName * getName() = 0;
   virtual ::java::util::Iterator * getNamespaces() = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
@@ -51,7 +51,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/NotationDeclaration.h
===================================================================
--- javax/xml/stream/events/NotationDeclaration.h	(revision 155473)
+++ javax/xml/stream/events/NotationDeclaration.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/Comment.h
===================================================================
--- javax/xml/stream/events/Comment.h	(revision 155473)
+++ javax/xml/stream/events/Comment.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/EntityDeclaration.h
===================================================================
--- javax/xml/stream/events/EntityDeclaration.h	(revision 155473)
+++ javax/xml/stream/events/EntityDeclaration.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -56,7 +56,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/XMLEvent.h
===================================================================
--- javax/xml/stream/events/XMLEvent.h	(revision 155473)
+++ javax/xml/stream/events/XMLEvent.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/Attribute.h
===================================================================
--- javax/xml/stream/events/Attribute.h	(revision 155473)
+++ javax/xml/stream/events/Attribute.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -36,7 +36,7 @@
 {
 
 public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
+  virtual ::javax::xml::namespace::QName * getName() = 0;
   virtual ::java::lang::String * getValue() = 0;
   virtual ::java::lang::String * getDTDType() = 0;
   virtual jboolean isSpecified() = 0;
@@ -54,7 +54,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/EndDocument.h
===================================================================
--- javax/xml/stream/events/EndDocument.h	(revision 155473)
+++ javax/xml/stream/events/EndDocument.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/events/StartElement.h
===================================================================
--- javax/xml/stream/events/StartElement.h	(revision 155473)
+++ javax/xml/stream/events/StartElement.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -37,11 +37,11 @@
 {
 
 public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
+  virtual ::javax::xml::namespace::QName * getName() = 0;
   virtual ::java::util::Iterator * getAttributes() = 0;
   virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
+  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *) = 0;
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
   virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
@@ -57,7 +57,7 @@
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
Index: javax/xml/stream/util/ReaderDelegate.h
===================================================================
--- javax/xml/stream/util/ReaderDelegate.h	(revision 155473)
+++ javax/xml/stream/util/ReaderDelegate.h	(working copy)
@@ -15,7 +15,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -48,14 +48,14 @@
   virtual jboolean hasNext();
   virtual void close();
   virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
+  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
   virtual jboolean isStartElement();
   virtual jboolean isEndElement();
   virtual jboolean isCharacters();
   virtual jboolean isWhiteSpace();
   virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
   virtual jint getAttributeCount();
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
+  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
   virtual ::java::lang::String * getAttributePrefix(jint);
   virtual ::java::lang::String * getAttributeNamespace(jint);
   virtual ::java::lang::String * getAttributeLocalName(jint);
@@ -74,7 +74,7 @@
   virtual ::java::lang::String * getEncoding();
   virtual jboolean hasText();
   virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace$::QName * getName();
+  virtual ::javax::xml::namespace::QName * getName();
   virtual ::java::lang::String * getLocalName();
   virtual jboolean hasName();
   virtual ::java::lang::String * getNamespaceURI();
Index: javax/xml/namespace/NamespaceContext.h
===================================================================
--- javax/xml/namespace/NamespaceContext.h	(revision 155473)
+++ javax/xml/namespace/NamespaceContext.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
       }
@@ -21,7 +21,7 @@
   }
 }
 
-class javax::xml::namespace$::NamespaceContext : public ::java::lang::Object
+class javax::xml::namespace::NamespaceContext : public ::java::lang::Object
 {
 
 public:
Index: javax/xml/namespace/QName.h
===================================================================
--- javax/xml/namespace/QName.h	(revision 155473)
+++ javax/xml/namespace/QName.h	(working copy)
@@ -13,7 +13,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -21,7 +21,7 @@
   }
 }
 
-class javax::xml::namespace$::QName : public ::java::lang::Object
+class javax::xml::namespace::QName : public ::java::lang::Object
 {
 
 public:
@@ -34,7 +34,7 @@
   virtual jboolean equals(::java::lang::Object *);
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
-  static ::javax::xml::namespace$::QName * valueOf(::java::lang::String *);
+  static ::javax::xml::namespace::QName * valueOf(::java::lang::String *);
 private:
   static const jlong serialVersionUID = 4418622981026545151LL;
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceURI;
Index: javax/security/auth/login/Configuration$1.h
===================================================================
--- javax/security/auth/login/Configuration$1.h	(revision 155473)
+++ javax/security/auth/login/Configuration$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   Configuration$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: javax/security/auth/kerberos/DelegationPermission$1.h
===================================================================
--- javax/security/auth/kerberos/DelegationPermission$1.h	(revision 155473)
+++ javax/security/auth/kerberos/DelegationPermission$1.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   DelegationPermission$1(::javax::security::auth::kerberos::DelegationPermission *);
 public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
+  virtual void add(::java::security::Permission *);
+  virtual jboolean implies(::java::security::Permission *);
+  virtual ::java::util::Enumeration * elements();
 private:
   ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
 public: // actually package-private
Index: javax/security/auth/kerberos/ServicePermission$1.h
===================================================================
--- javax/security/auth/kerberos/ServicePermission$1.h	(revision 155473)
+++ javax/security/auth/kerberos/ServicePermission$1.h	(working copy)
@@ -38,9 +38,9 @@
 public: // actually package-private
   ServicePermission$1(::javax::security::auth::kerberos::ServicePermission *);
 public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
+  virtual void add(::java::security::Permission *);
+  virtual jboolean implies(::java::security::Permission *);
+  virtual ::java::util::Enumeration * elements();
 private:
   ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
 public: // actually package-private
Index: javax/naming/directory/BasicAttributes$1.h
===================================================================
--- javax/naming/directory/BasicAttributes$1.h	(revision 155473)
+++ javax/naming/directory/BasicAttributes$1.h	(working copy)
@@ -29,13 +29,13 @@
 public: // actually package-private
   BasicAttributes$1(::javax::naming::directory::BasicAttributes *, ::javax::naming::NamingEnumeration *);
 public:
-  jboolean hasMore();
-  jboolean hasMoreElements();
-  ::java::lang::String * BasicAttributes$1$next();
-  ::java::lang::String * BasicAttributes$1$nextElement();
-  void close();
-  ::java::lang::Object * next();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMore();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::String * BasicAttributes$1$next();
+  virtual ::java::lang::String * BasicAttributes$1$nextElement();
+  virtual void close();
+  virtual ::java::lang::Object * next();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::javax::naming::directory::BasicAttributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: javax/imageio/metadata/IIOMetadataFormatImpl$1.h
===================================================================
--- javax/imageio/metadata/IIOMetadataFormatImpl$1.h	(revision 155473)
+++ javax/imageio/metadata/IIOMetadataFormatImpl$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   IIOMetadataFormatImpl$1(::java::lang::String *, jint);
 public:
-  jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *);
+  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *);
   static ::java::lang::Class class$;
 };
 
Index: javax/imageio/ImageIO$1.h
===================================================================
--- javax/imageio/ImageIO$1.h	(revision 155473)
+++ javax/imageio/ImageIO$1.h	(working copy)
@@ -25,10 +25,10 @@
 public: // actually package-private
   ImageIO$1(::java::util::Iterator *);
 public:
-  jboolean hasNext();
-  ::javax::imageio::ImageTranscoder * ImageIO$1$next();
-  void remove();
-  ::java::lang::Object * next();
+  virtual jboolean hasNext();
+  virtual ::javax::imageio::ImageTranscoder * ImageIO$1$next();
+  virtual void remove();
+  virtual ::java::lang::Object * next();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$spiIterator;
 public:
Index: javax/imageio/spi/ServiceRegistry$1.h
===================================================================
--- javax/imageio/spi/ServiceRegistry$1.h	(revision 155473)
+++ javax/imageio/spi/ServiceRegistry$1.h	(working copy)
@@ -28,9 +28,9 @@
 public: // actually package-private
   ServiceRegistry$1(::javax::imageio::spi::ServiceRegistry *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
   ::javax::imageio::spi::ServiceRegistry * this$0;
Index: javax/imageio/spi/ServiceRegistry$2.h
===================================================================
--- javax/imageio/spi/ServiceRegistry$2.h	(revision 155473)
+++ javax/imageio/spi/ServiceRegistry$2.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   ServiceRegistry$2(::javax::imageio::spi::ServiceRegistry *, ::java::util::Map *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::javax::imageio::spi::ServiceRegistry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h
===================================================================
--- org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h	(revision 155473)
+++ org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h	(working copy)
@@ -32,8 +32,8 @@
 public: // actually package-private
   DOMImplementationRegistry$1(::org::w3c::dom::bootstrap::DOMImplementationRegistry *, ::java::util::Vector *);
 public:
-  ::org::w3c::dom::DOMImplementation * item(jint);
-  jint getLength();
+  virtual ::org::w3c::dom::DOMImplementation * item(jint);
+  virtual jint getLength();
 public: // actually package-private
   ::org::w3c::dom::bootstrap::DOMImplementationRegistry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h
===================================================================
--- org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h	(revision 155473)
+++ org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   DOMImplementationRegistry$2();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h
===================================================================
--- org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h	(revision 155473)
+++ org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   DOMImplementationRegistry$3(::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
 public:
Index: org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h
===================================================================
--- org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h	(revision 155473)
+++ org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   DOMImplementationRegistry$4(::java::lang::ClassLoader *, ::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$classLoader;
   ::java::lang::String * val$name;
Index: gnu/xml/xpath/Predicate.h
===================================================================
--- gnu/xml/xpath/Predicate.h	(revision 155473)
+++ gnu/xml/xpath/Predicate.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/LocalNameFunction.h
===================================================================
--- gnu/xml/xpath/LocalNameFunction.h	(revision 155473)
+++ gnu/xml/xpath/LocalNameFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/IdFunction.h
===================================================================
--- gnu/xml/xpath/IdFunction.h	(revision 155473)
+++ gnu/xml/xpath/IdFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -52,7 +52,7 @@
   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;
Index: gnu/xml/xpath/ParenthesizedExpr.h
===================================================================
--- gnu/xml/xpath/ParenthesizedExpr.h	(revision 155473)
+++ gnu/xml/xpath/ParenthesizedExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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;
Index: gnu/xml/xpath/Expr.h
===================================================================
--- gnu/xml/xpath/Expr.h	(revision 155473)
+++ gnu/xml/xpath/Expr.h	(working copy)
@@ -30,7 +30,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -60,13 +60,13 @@
 
 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 *);
Index: gnu/xml/xpath/Test.h
===================================================================
--- gnu/xml/xpath/Test.h	(revision 155473)
+++ gnu/xml/xpath/Test.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -48,7 +48,7 @@
   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$;
 };
 
Index: gnu/xml/xpath/FloorFunction.h
===================================================================
--- gnu/xml/xpath/FloorFunction.h	(revision 155473)
+++ gnu/xml/xpath/FloorFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/ArithmeticExpr.h
===================================================================
--- gnu/xml/xpath/ArithmeticExpr.h	(revision 155473)
+++ gnu/xml/xpath/ArithmeticExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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;
Index: gnu/xml/xpath/RelationalExpr.h
===================================================================
--- gnu/xml/xpath/RelationalExpr.h	(revision 155473)
+++ gnu/xml/xpath/RelationalExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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;
Index: gnu/xml/xpath/RoundFunction.h
===================================================================
--- gnu/xml/xpath/RoundFunction.h	(revision 155473)
+++ gnu/xml/xpath/RoundFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/TranslateFunction.h
===================================================================
--- gnu/xml/xpath/TranslateFunction.h	(revision 155473)
+++ gnu/xml/xpath/TranslateFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/LastFunction.h
===================================================================
--- gnu/xml/xpath/LastFunction.h	(revision 155473)
+++ gnu/xml/xpath/LastFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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$;
 };
Index: gnu/xml/xpath/Selector.h
===================================================================
--- gnu/xml/xpath/Selector.h	(revision 155473)
+++ gnu/xml/xpath/Selector.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -72,7 +72,7 @@
   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;
Index: gnu/xml/xpath/NamespaceUriFunction.h
===================================================================
--- gnu/xml/xpath/NamespaceUriFunction.h	(revision 155473)
+++ gnu/xml/xpath/NamespaceUriFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/TrueFunction.h
===================================================================
--- gnu/xml/xpath/TrueFunction.h	(revision 155473)
+++ gnu/xml/xpath/TrueFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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$;
 };
Index: gnu/xml/xpath/UnionExpr.h
===================================================================
--- gnu/xml/xpath/UnionExpr.h	(revision 155473)
+++ gnu/xml/xpath/UnionExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
   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;
Index: gnu/xml/xpath/Constant.h
===================================================================
--- gnu/xml/xpath/Constant.h	(revision 155473)
+++ gnu/xml/xpath/Constant.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
   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;
Index: gnu/xml/xpath/NamespaceTest.h
===================================================================
--- gnu/xml/xpath/NamespaceTest.h	(revision 155473)
+++ gnu/xml/xpath/NamespaceTest.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -46,15 +46,15 @@
 {
 
 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:
Index: gnu/xml/xpath/XPathParser.h
===================================================================
--- gnu/xml/xpath/XPathParser.h	(revision 155473)
+++ gnu/xml/xpath/XPathParser.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -47,7 +47,7 @@
 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:
   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:
Index: gnu/xml/xpath/NotFunction.h
===================================================================
--- gnu/xml/xpath/NotFunction.h	(revision 155473)
+++ gnu/xml/xpath/NotFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/SubstringBeforeFunction.h
===================================================================
--- gnu/xml/xpath/SubstringBeforeFunction.h	(revision 155473)
+++ gnu/xml/xpath/SubstringBeforeFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/SumFunction.h
===================================================================
--- gnu/xml/xpath/SumFunction.h	(revision 155473)
+++ gnu/xml/xpath/SumFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/PositionFunction.h
===================================================================
--- gnu/xml/xpath/PositionFunction.h	(revision 155473)
+++ gnu/xml/xpath/PositionFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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$;
 };
Index: gnu/xml/xpath/StringFunction.h
===================================================================
--- gnu/xml/xpath/StringFunction.h	(revision 155473)
+++ gnu/xml/xpath/StringFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/ConcatFunction.h
===================================================================
--- gnu/xml/xpath/ConcatFunction.h	(revision 155473)
+++ gnu/xml/xpath/ConcatFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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;
Index: gnu/xml/xpath/CeilingFunction.h
===================================================================
--- gnu/xml/xpath/CeilingFunction.h	(revision 155473)
+++ gnu/xml/xpath/CeilingFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/FunctionCall.h
===================================================================
--- gnu/xml/xpath/FunctionCall.h	(revision 155473)
+++ gnu/xml/xpath/FunctionCall.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -54,7 +54,7 @@
   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;
Index: gnu/xml/xpath/NormalizeSpaceFunction.h
===================================================================
--- gnu/xml/xpath/NormalizeSpaceFunction.h	(revision 155473)
+++ gnu/xml/xpath/NormalizeSpaceFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/Root.h
===================================================================
--- gnu/xml/xpath/Root.h	(revision 155473)
+++ gnu/xml/xpath/Root.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   ::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$;
 };
Index: gnu/xml/xpath/NameFunction.h
===================================================================
--- gnu/xml/xpath/NameFunction.h	(revision 155473)
+++ gnu/xml/xpath/NameFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/EqualityExpr.h
===================================================================
--- gnu/xml/xpath/EqualityExpr.h	(revision 155473)
+++ gnu/xml/xpath/EqualityExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,7 +53,7 @@
   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;
Index: gnu/xml/xpath/Steps.h
===================================================================
--- gnu/xml/xpath/Steps.h	(revision 155473)
+++ gnu/xml/xpath/Steps.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -61,7 +61,7 @@
   ::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;
Index: gnu/xml/xpath/CountFunction.h
===================================================================
--- gnu/xml/xpath/CountFunction.h	(revision 155473)
+++ gnu/xml/xpath/CountFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/NumberFunction.h
===================================================================
--- gnu/xml/xpath/NumberFunction.h	(revision 155473)
+++ gnu/xml/xpath/NumberFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/FalseFunction.h
===================================================================
--- gnu/xml/xpath/FalseFunction.h	(revision 155473)
+++ gnu/xml/xpath/FalseFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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$;
 };
Index: gnu/xml/xpath/AndExpr.h
===================================================================
--- gnu/xml/xpath/AndExpr.h	(revision 155473)
+++ gnu/xml/xpath/AndExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
   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;
Index: gnu/xml/xpath/NegativeExpr.h
===================================================================
--- gnu/xml/xpath/NegativeExpr.h	(revision 155473)
+++ gnu/xml/xpath/NegativeExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 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;
Index: gnu/xml/xpath/VariableReference.h
===================================================================
--- gnu/xml/xpath/VariableReference.h	(revision 155473)
+++ gnu/xml/xpath/VariableReference.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,14 +50,14 @@
 {
 
 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$;
 };
Index: gnu/xml/xpath/XPathImpl.h
===================================================================
--- gnu/xml/xpath/XPathImpl.h	(revision 155473)
+++ gnu/xml/xpath/XPathImpl.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -53,23 +53,23 @@
 {
 
 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:
Index: gnu/xml/xpath/SubstringAfterFunction.h
===================================================================
--- gnu/xml/xpath/SubstringAfterFunction.h	(revision 155473)
+++ gnu/xml/xpath/SubstringAfterFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/StringLengthFunction.h
===================================================================
--- gnu/xml/xpath/StringLengthFunction.h	(revision 155473)
+++ gnu/xml/xpath/StringLengthFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/OrExpr.h
===================================================================
--- gnu/xml/xpath/OrExpr.h	(revision 155473)
+++ gnu/xml/xpath/OrExpr.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
   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;
Index: gnu/xml/xpath/NameTest.h
===================================================================
--- gnu/xml/xpath/NameTest.h	(revision 155473)
+++ gnu/xml/xpath/NameTest.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -46,7 +46,7 @@
 {
 
 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 @@
   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:
Index: gnu/xml/xpath/StartsWithFunction.h
===================================================================
--- gnu/xml/xpath/StartsWithFunction.h	(revision 155473)
+++ gnu/xml/xpath/StartsWithFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/ContainsFunction.h
===================================================================
--- gnu/xml/xpath/ContainsFunction.h	(revision 155473)
+++ gnu/xml/xpath/ContainsFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/BooleanFunction.h
===================================================================
--- gnu/xml/xpath/BooleanFunction.h	(revision 155473)
+++ gnu/xml/xpath/BooleanFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/SubstringFunction.h
===================================================================
--- gnu/xml/xpath/SubstringFunction.h	(revision 155473)
+++ gnu/xml/xpath/SubstringFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,7 +51,7 @@
 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;
Index: gnu/xml/xpath/LangFunction.h
===================================================================
--- gnu/xml/xpath/LangFunction.h	(revision 155473)
+++ gnu/xml/xpath/LangFunction.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -54,7 +54,7 @@
   ::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;
Index: gnu/xml/xpath/NodeTypeTest.h
===================================================================
--- gnu/xml/xpath/NodeTypeTest.h	(revision 155473)
+++ gnu/xml/xpath/NodeTypeTest.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -52,7 +52,7 @@
   ::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;
Index: gnu/xml/validation/xmlschema/ElementDeclaration.h
===================================================================
--- gnu/xml/validation/xmlschema/ElementDeclaration.h	(revision 155473)
+++ gnu/xml/validation/xmlschema/ElementDeclaration.h	(working copy)
@@ -31,7 +31,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -43,15 +43,15 @@
 {
 
 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;
Index: gnu/xml/validation/xmlschema/AttributeDeclaration.h
===================================================================
--- gnu/xml/validation/xmlschema/AttributeDeclaration.h	(revision 155473)
+++ gnu/xml/validation/xmlschema/AttributeDeclaration.h	(working copy)
@@ -31,7 +31,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -43,14 +43,14 @@
 {
 
 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:
Index: gnu/xml/validation/xmlschema/ComplexType.h
===================================================================
--- gnu/xml/validation/xmlschema/ComplexType.h	(revision 155473)
+++ gnu/xml/validation/xmlschema/ComplexType.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -39,8 +39,8 @@
 {
 
 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;
Index: gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
===================================================================
--- gnu/xml/validation/xmlschema/XMLSchemaBuilder.h	(revision 155473)
+++ gnu/xml/validation/xmlschema/XMLSchemaBuilder.h	(working copy)
@@ -36,7 +36,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -77,7 +77,7 @@
   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 @@
   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;
Index: gnu/xml/validation/datatype/ListSimpleType.h
===================================================================
--- gnu/xml/validation/datatype/ListSimpleType.h	(revision 155473)
+++ gnu/xml/validation/datatype/ListSimpleType.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 {
 
 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$;
Index: gnu/xml/validation/datatype/Type.h
===================================================================
--- gnu/xml/validation/datatype/Type.h	(revision 155473)
+++ gnu/xml/validation/datatype/Type.h	(working copy)
@@ -26,7 +26,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -38,9 +38,9 @@
 {
 
 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$;
 };
 
Index: gnu/xml/validation/datatype/UnionSimpleType.h
===================================================================
--- gnu/xml/validation/datatype/UnionSimpleType.h	(revision 155473)
+++ gnu/xml/validation/datatype/UnionSimpleType.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 {
 
 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$;
Index: gnu/xml/validation/datatype/AtomicSimpleType.h
===================================================================
--- gnu/xml/validation/datatype/AtomicSimpleType.h	(revision 155473)
+++ gnu/xml/validation/datatype/AtomicSimpleType.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,9 +50,9 @@
 {
 
 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$;
Index: gnu/xml/validation/datatype/SimpleType.h
===================================================================
--- gnu/xml/validation/datatype/SimpleType.h	(revision 155473)
+++ gnu/xml/validation/datatype/SimpleType.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -50,7 +50,7 @@
 {
 
 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:
Index: gnu/xml/stream/StartElementImpl.h
===================================================================
--- gnu/xml/stream/StartElementImpl.h	(revision 155473)
+++ gnu/xml/stream/StartElementImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -44,21 +44,21 @@
 {
 
 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$;
 };
Index: gnu/xml/stream/XMLEventFactoryImpl.h
===================================================================
--- gnu/xml/stream/XMLEventFactoryImpl.h	(revision 155473)
+++ gnu/xml/stream/XMLEventFactoryImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -59,14 +59,14 @@
   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 *);
Index: gnu/xml/stream/XMLEventWriterImpl.h
===================================================================
--- gnu/xml/stream/XMLEventWriterImpl.h	(revision 155473)
+++ gnu/xml/stream/XMLEventWriterImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
       }
@@ -53,8 +53,8 @@
   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:
Index: gnu/xml/stream/XMLStreamWriterImpl.h
===================================================================
--- gnu/xml/stream/XMLStreamWriterImpl.h	(revision 155473)
+++ gnu/xml/stream/XMLStreamWriterImpl.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
       }
@@ -89,8 +89,8 @@
   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 @@
   ::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;
Index: gnu/xml/stream/EndElementImpl.h
===================================================================
--- gnu/xml/stream/EndElementImpl.h	(revision 155473)
+++ gnu/xml/stream/EndElementImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -39,14 +39,14 @@
 {
 
 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$;
Index: gnu/xml/stream/XMLParser.h
===================================================================
--- gnu/xml/stream/XMLParser.h	(revision 155473)
+++ gnu/xml/stream/XMLParser.h	(working copy)
@@ -39,7 +39,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -64,12 +64,12 @@
   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 @@
   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();
Index: gnu/xml/stream/XIncludeFilter.h
===================================================================
--- gnu/xml/stream/XIncludeFilter.h	(revision 155473)
+++ gnu/xml/stream/XIncludeFilter.h	(working copy)
@@ -32,7 +32,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -79,7 +79,7 @@
   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 @@
   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();
Index: gnu/xml/stream/XMLEventImpl.h
===================================================================
--- gnu/xml/stream/XMLEventImpl.h	(revision 155473)
+++ gnu/xml/stream/XMLEventImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -61,7 +61,7 @@
   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);
Index: gnu/xml/stream/AttributeImpl.h
===================================================================
--- gnu/xml/stream/AttributeImpl.h	(revision 155473)
+++ gnu/xml/stream/AttributeImpl.h	(working copy)
@@ -23,7 +23,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -39,16 +39,16 @@
 {
 
 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;
Index: gnu/xml/transform/Stylesheet.h
===================================================================
--- gnu/xml/transform/Stylesheet.h	(revision 155473)
+++ gnu/xml/transform/Stylesheet.h	(working copy)
@@ -33,7 +33,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -74,9 +74,9 @@
   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 @@
   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 *);
Index: gnu/xml/transform/MessageNode.h
===================================================================
--- gnu/xml/transform/MessageNode.h	(revision 155473)
+++ gnu/xml/transform/MessageNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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
Index: gnu/xml/transform/TextNode.h
===================================================================
--- gnu/xml/transform/TextNode.h	(revision 155473)
+++ gnu/xml/transform/TextNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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
Index: gnu/xml/transform/WithParam.h
===================================================================
--- gnu/xml/transform/WithParam.h	(revision 155473)
+++ gnu/xml/transform/WithParam.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,12 +51,12 @@
 {
 
 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:
Index: gnu/xml/transform/Bindings.h
===================================================================
--- gnu/xml/transform/Bindings.h	(revision 155473)
+++ gnu/xml/transform/Bindings.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,12 +53,12 @@
   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;
Index: gnu/xml/transform/KeyFunction.h
===================================================================
--- gnu/xml/transform/KeyFunction.h	(revision 155473)
+++ gnu/xml/transform/KeyFunction.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -61,7 +61,7 @@
   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;
Index: gnu/xml/transform/ElementNode.h
===================================================================
--- gnu/xml/transform/ElementNode.h	(revision 155473)
+++ gnu/xml/transform/ElementNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,11 +49,11 @@
 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;
Index: gnu/xml/transform/SystemPropertyFunction.h
===================================================================
--- gnu/xml/transform/SystemPropertyFunction.h	(revision 155473)
+++ gnu/xml/transform/SystemPropertyFunction.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -55,10 +55,10 @@
   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:
Index: gnu/xml/transform/LiteralNode.h
===================================================================
--- gnu/xml/transform/LiteralNode.h	(revision 155473)
+++ gnu/xml/transform/LiteralNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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
Index: gnu/xml/transform/ApplyImportsNode.h
===================================================================
--- gnu/xml/transform/ApplyImportsNode.h	(revision 155473)
+++ gnu/xml/transform/ApplyImportsNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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$;
Index: gnu/xml/transform/AttributeNode.h
===================================================================
--- gnu/xml/transform/AttributeNode.h	(revision 155473)
+++ gnu/xml/transform/AttributeNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,11 +49,11 @@
 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;
Index: gnu/xml/transform/GenerateIdFunction.h
===================================================================
--- gnu/xml/transform/GenerateIdFunction.h	(revision 155473)
+++ gnu/xml/transform/GenerateIdFunction.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -55,7 +55,7 @@
   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:
Index: gnu/xml/transform/ForEachNode.h
===================================================================
--- gnu/xml/transform/ForEachNode.h	(revision 155473)
+++ gnu/xml/transform/ForEachNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,9 +53,9 @@
 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;
Index: gnu/xml/transform/CallTemplateNode.h
===================================================================
--- gnu/xml/transform/CallTemplateNode.h	(revision 155473)
+++ gnu/xml/transform/CallTemplateNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -47,14 +47,14 @@
 {
 
 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$;
Index: gnu/xml/transform/CopyNode.h
===================================================================
--- gnu/xml/transform/CopyNode.h	(revision 155473)
+++ gnu/xml/transform/CopyNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,8 +49,8 @@
 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
Index: gnu/xml/transform/AbstractNumberNode.h
===================================================================
--- gnu/xml/transform/AbstractNumberNode.h	(revision 155473)
+++ gnu/xml/transform/AbstractNumberNode.h	(working copy)
@@ -34,7 +34,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -57,7 +57,7 @@
 
 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 @@
   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;
Index: gnu/xml/transform/ProcessingInstructionNode.h
===================================================================
--- gnu/xml/transform/ProcessingInstructionNode.h	(revision 155473)
+++ gnu/xml/transform/ProcessingInstructionNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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
Index: gnu/xml/transform/ChooseNode.h
===================================================================
--- gnu/xml/transform/ChooseNode.h	(revision 155473)
+++ gnu/xml/transform/ChooseNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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$;
Index: gnu/xml/transform/Key.h
===================================================================
--- gnu/xml/transform/Key.h	(revision 155473)
+++ gnu/xml/transform/Key.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -41,9 +41,9 @@
 {
 
 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:
Index: gnu/xml/transform/FunctionAvailableFunction.h
===================================================================
--- gnu/xml/transform/FunctionAvailableFunction.h	(revision 155473)
+++ gnu/xml/transform/FunctionAvailableFunction.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -50,18 +50,18 @@
 {
 
 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$;
Index: gnu/xml/transform/ElementAvailableFunction.h
===================================================================
--- gnu/xml/transform/ElementAvailableFunction.h	(revision 155473)
+++ gnu/xml/transform/ElementAvailableFunction.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class NamespaceContext;
           class QName;
@@ -50,17 +50,17 @@
 {
 
 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$;
Index: gnu/xml/transform/SortKey.h
===================================================================
--- gnu/xml/transform/SortKey.h	(revision 155473)
+++ gnu/xml/transform/SortKey.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,8 +53,8 @@
 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 *);
Index: gnu/xml/transform/IfNode.h
===================================================================
--- gnu/xml/transform/IfNode.h	(revision 155473)
+++ gnu/xml/transform/IfNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,9 +53,9 @@
 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;
Index: gnu/xml/transform/UnparsedEntityUriFunction.h
===================================================================
--- gnu/xml/transform/UnparsedEntityUriFunction.h	(revision 155473)
+++ gnu/xml/transform/UnparsedEntityUriFunction.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -55,7 +55,7 @@
   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:
Index: gnu/xml/transform/CopyOfNode.h
===================================================================
--- gnu/xml/transform/CopyOfNode.h	(revision 155473)
+++ gnu/xml/transform/CopyOfNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,9 +53,9 @@
 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;
Index: gnu/xml/transform/FormatNumberFunction.h
===================================================================
--- gnu/xml/transform/FormatNumberFunction.h	(revision 155473)
+++ gnu/xml/transform/FormatNumberFunction.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -56,7 +56,7 @@
   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;
Index: gnu/xml/transform/ValueOfNode.h
===================================================================
--- gnu/xml/transform/ValueOfNode.h	(revision 155473)
+++ gnu/xml/transform/ValueOfNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,9 +53,9 @@
 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;
Index: gnu/xml/transform/WhenNode.h
===================================================================
--- gnu/xml/transform/WhenNode.h	(revision 155473)
+++ gnu/xml/transform/WhenNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,9 +53,9 @@
 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;
Index: gnu/xml/transform/CommentNode.h
===================================================================
--- gnu/xml/transform/CommentNode.h	(revision 155473)
+++ gnu/xml/transform/CommentNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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$;
Index: gnu/xml/transform/ApplyTemplatesNode.h
===================================================================
--- gnu/xml/transform/ApplyTemplatesNode.h	(revision 155473)
+++ gnu/xml/transform/ApplyTemplatesNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,15 +51,15 @@
 {
 
 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;
Index: gnu/xml/transform/Template.h
===================================================================
--- gnu/xml/transform/Template.h	(revision 155473)
+++ gnu/xml/transform/Template.h	(working copy)
@@ -31,7 +31,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -53,31 +53,31 @@
 {
 
 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$;
Index: gnu/xml/transform/OtherwiseNode.h
===================================================================
--- gnu/xml/transform/OtherwiseNode.h	(revision 155473)
+++ gnu/xml/transform/OtherwiseNode.h	(working copy)
@@ -25,7 +25,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -49,7 +49,7 @@
 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$;
Index: gnu/xml/transform/TemplateNode.h
===================================================================
--- gnu/xml/transform/TemplateNode.h	(revision 155473)
+++ gnu/xml/transform/TemplateNode.h	(working copy)
@@ -24,7 +24,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -47,14 +47,14 @@
 
 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;
Index: gnu/xml/transform/DocumentFunction.h
===================================================================
--- gnu/xml/transform/DocumentFunction.h	(revision 155473)
+++ gnu/xml/transform/DocumentFunction.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -59,7 +59,7 @@
   ::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;
Index: gnu/xml/transform/TransformerImpl.h
===================================================================
--- gnu/xml/transform/TransformerImpl.h	(revision 155473)
+++ gnu/xml/transform/TransformerImpl.h	(working copy)
@@ -27,7 +27,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -86,7 +86,7 @@
 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;
Index: gnu/xml/transform/ParameterNode.h
===================================================================
--- gnu/xml/transform/ParameterNode.h	(revision 155473)
+++ gnu/xml/transform/ParameterNode.h	(working copy)
@@ -29,7 +29,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -51,12 +51,12 @@
 {
 
 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:
   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:
Index: gnu/xml/transform/CurrentFunction.h
===================================================================
--- gnu/xml/transform/CurrentFunction.h	(revision 155473)
+++ gnu/xml/transform/CurrentFunction.h	(working copy)
@@ -28,7 +28,7 @@
   {
     namespace xml
     {
-      namespace namespace$
+      namespace namespace
       {
           class QName;
       }
@@ -56,7 +56,7 @@
   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;
Index: gnu/java/nio/charset/Provider$1.h
===================================================================
--- gnu/java/nio/charset/Provider$1.h	(revision 155473)
+++ gnu/java/nio/charset/Provider$1.h	(working copy)
@@ -31,8 +31,8 @@
 public: // actually package-private
   Provider$1();
 public:
-  ::gnu::java::nio::charset::Provider * Provider$1$run();
-  ::java::lang::Object * run();
+  virtual ::gnu::java::nio::charset::Provider * Provider$1$run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: gnu/java/nio/charset/US_ASCII$2.h
===================================================================
--- gnu/java/nio/charset/US_ASCII$2.h	(revision 155473)
+++ gnu/java/nio/charset/US_ASCII$2.h	(working copy)
@@ -30,8 +30,8 @@
 public: // actually package-private
   US_ASCII$2();
 public: // actually protected
-  jboolean isMappable(jchar);
-  jbyte mapToByte(jchar);
+  virtual jboolean isMappable(jchar);
+  virtual jbyte mapToByte(jchar);
 public:
   static ::java::lang::Class class$;
 };
Index: gnu/java/nio/charset/ISO_8859_1$1.h
===================================================================
--- gnu/java/nio/charset/ISO_8859_1$1.h	(revision 155473)
+++ gnu/java/nio/charset/ISO_8859_1$1.h	(working copy)
@@ -30,8 +30,8 @@
 public: // actually package-private
   ISO_8859_1$1();
 public: // actually protected
-  jboolean isMappable(jbyte);
-  jchar mapToChar(jbyte);
+  virtual jboolean isMappable(jbyte);
+  virtual jchar mapToChar(jbyte);
 public:
   static ::java::lang::Class class$;
 };
Index: gnu/java/nio/charset/ByteCharset$1.h
===================================================================
--- gnu/java/nio/charset/ByteCharset$1.h	(revision 155473)
+++ gnu/java/nio/charset/ByteCharset$1.h	(working copy)
@@ -31,8 +31,8 @@
 public: // actually package-private
   ByteCharset$1(::gnu::java::nio::charset::ByteCharset$Decoder *);
 public: // actually protected
-  jboolean isMappable(jbyte);
-  jchar mapToChar(jbyte);
+  virtual jboolean isMappable(jbyte);
+  virtual jchar mapToChar(jbyte);
 public: // actually package-private
   ::gnu::java::nio::charset::ByteCharset$Decoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteDecodeLoopHelper)))) this$1;
 public:
Index: gnu/java/nio/charset/US_ASCII$1.h
===================================================================
--- gnu/java/nio/charset/US_ASCII$1.h	(revision 155473)
+++ gnu/java/nio/charset/US_ASCII$1.h	(working copy)
@@ -30,8 +30,8 @@
 public: // actually package-private
   US_ASCII$1();
 public: // actually protected
-  jboolean isMappable(jbyte);
-  jchar mapToChar(jbyte);
+  virtual jboolean isMappable(jbyte);
+  virtual jchar mapToChar(jbyte);
 public:
   static ::java::lang::Class class$;
 };
Index: gnu/java/nio/charset/ISO_8859_1$2.h
===================================================================
--- gnu/java/nio/charset/ISO_8859_1$2.h	(revision 155473)
+++ gnu/java/nio/charset/ISO_8859_1$2.h	(working copy)
@@ -30,8 +30,8 @@
 public: // actually package-private
   ISO_8859_1$2();
 public: // actually protected
-  jboolean isMappable(jchar);
-  jbyte mapToByte(jchar);
+  virtual jboolean isMappable(jchar);
+  virtual jbyte mapToByte(jchar);
 public:
   static ::java::lang::Class class$;
 };
Index: gnu/java/nio/charset/ByteCharset$2.h
===================================================================
--- gnu/java/nio/charset/ByteCharset$2.h	(revision 155473)
+++ gnu/java/nio/charset/ByteCharset$2.h	(working copy)
@@ -31,8 +31,8 @@
 public: // actually package-private
   ByteCharset$2(::gnu::java::nio::charset::ByteCharset$Encoder *);
 public: // actually protected
-  jboolean isMappable(jchar);
-  jbyte mapToByte(jchar);
+  virtual jboolean isMappable(jchar);
+  virtual jbyte mapToByte(jchar);
 public: // actually package-private
   ::gnu::java::nio::charset::ByteCharset$Encoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteEncodeLoopHelper)))) this$1;
 public:
Index: gnu/java/net/protocol/http/HTTPURLConnection$1.h
===================================================================
--- gnu/java/net/protocol/http/HTTPURLConnection$1.h	(revision 155473)
+++ gnu/java/net/protocol/http/HTTPURLConnection$1.h	(working copy)
@@ -35,7 +35,7 @@
 public: // actually package-private
   HTTPURLConnection$1(::gnu::java::net::protocol::http::HTTPURLConnection *, ::gnu::java::net::protocol::http::Credentials *);
 public:
-  ::gnu::java::net::protocol::http::Credentials * getCredentials(::java::lang::String *, jint);
+  virtual ::gnu::java::net::protocol::http::Credentials * getCredentials(::java::lang::String *, jint);
 public: // actually package-private
   ::gnu::java::net::protocol::http::HTTPURLConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/java/rmi/server/UnicastConnectionManager$1.h
===================================================================
--- gnu/java/rmi/server/UnicastConnectionManager$1.h	(revision 155473)
+++ gnu/java/rmi/server/UnicastConnectionManager$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   UnicastConnectionManager$1();
 public:
-  void run();
+  virtual void run();
   static ::java::lang::Class class$;
 };
 
Index: gnu/java/security/provider/Gnu$1.h
===================================================================
--- gnu/java/security/provider/Gnu$1.h	(revision 155473)
+++ gnu/java/security/provider/Gnu$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   Gnu$1(::gnu::java::security::provider::Gnu *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::java::security::provider::Gnu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/java/security/Properties$1.h
===================================================================
--- gnu/java/security/Properties$1.h	(revision 155473)
+++ gnu/java/security/Properties$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   Properties$1(::gnu::java::security::Properties *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::java::security::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/java/security/PolicyFile$1.h
===================================================================
--- gnu/java/security/PolicyFile$1.h	(revision 155473)
+++ gnu/java/security/PolicyFile$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   PolicyFile$1(::gnu::java::security::PolicyFile *, ::java::util::List *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::java::security::PolicyFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/java/security/util/IntegerUtil$1.h
===================================================================
--- gnu/java/security/util/IntegerUtil$1.h	(revision 155473)
+++ gnu/java/security/util/IntegerUtil$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   IntegerUtil$1(jint, jfloat, jboolean);
 public:
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
+  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
   static ::java::lang::Class class$;
 };
 
Index: gnu/java/awt/peer/qt/QtVolatileImage$1.h
===================================================================
--- gnu/java/awt/peer/qt/QtVolatileImage$1.h	(revision 155473)
+++ gnu/java/awt/peer/qt/QtVolatileImage$1.h	(working copy)
@@ -34,7 +34,7 @@
 public: // actually package-private
   QtVolatileImage$1(::gnu::java::awt::peer::qt::QtVolatileImage *, jboolean);
 public:
-  jboolean isTrueVolatile();
+  virtual jboolean isTrueVolatile();
 public: // actually package-private
   ::gnu::java::awt::peer::qt::QtVolatileImage * __attribute__((aligned(__alignof__( ::java::awt::ImageCapabilities)))) this$0;
 public:
Index: gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h
===================================================================
--- gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h	(revision 155473)
+++ gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   SwingTextAreaPeer$1(::gnu::java::awt::peer::swing::SwingTextAreaPeer *);
 public:
-  ::java::awt::Image * createImage(jint, jint);
+  virtual ::java::awt::Image * createImage(jint, jint);
 public: // actually package-private
   ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
 public:
Index: gnu/java/util/prefs/FileBasedPreferences$1.h
===================================================================
--- gnu/java/util/prefs/FileBasedPreferences$1.h	(revision 155473)
+++ gnu/java/util/prefs/FileBasedPreferences$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   FileBasedPreferences$1(::gnu::java::util::prefs::FileBasedPreferences *);
 public:
-  jboolean accept(::java::io::File *, ::java::lang::String *);
+  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
 public: // actually package-private
   ::gnu::java::util::prefs::FileBasedPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/java/util/regex/RETokenNamedProperty$1.h
===================================================================
--- gnu/java/util/regex/RETokenNamedProperty$1.h	(revision 155473)
+++ gnu/java/util/regex/RETokenNamedProperty$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   RETokenNamedProperty$1(::gnu::java::util::regex::RETokenNamedProperty *);
 public:
-  jboolean includes(jchar);
+  virtual jboolean includes(jchar);
 public: // actually package-private
   ::gnu::java::util::regex::RETokenNamedProperty * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) this$0;
 public:
Index: gnu/java/util/WeakIdentityHashMap$1.h
===================================================================
--- gnu/java/util/WeakIdentityHashMap$1.h	(revision 155473)
+++ gnu/java/util/WeakIdentityHashMap$1.h	(working copy)
@@ -32,9 +32,9 @@
   void checkMod();
   ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * findNext(::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastEntry;
   ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * nextEntry;
Index: gnu/classpath/jdwp/Jdwp$1.h
===================================================================
--- gnu/classpath/jdwp/Jdwp$1.h	(revision 155473)
+++ gnu/classpath/jdwp/Jdwp$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   Jdwp$1(::gnu::classpath::jdwp::Jdwp *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::classpath::jdwp::Jdwp * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/gcj/runtime/HelperClassLoader$1.h
===================================================================
--- gnu/gcj/runtime/HelperClassLoader$1.h	(revision 155473)
+++ gnu/gcj/runtime/HelperClassLoader$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   HelperClassLoader$1(::gnu::gcj::runtime::HelperClassLoader *);
 public:
-  jboolean accept(::java::io::File *, ::java::lang::String *);
+  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
 public: // actually package-private
   ::gnu::gcj::runtime::HelperClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/CORBA/CDR/gnuRuntime$1.h
===================================================================
--- gnu/CORBA/CDR/gnuRuntime$1.h	(revision 155473)
+++ gnu/CORBA/CDR/gnuRuntime$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   gnuRuntime$1(::gnu::CORBA::CDR::gnuRuntime *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::gnu::CORBA::CDR::gnuRuntime * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/CORBA/OrbFunctional$2.h
===================================================================
--- gnu/CORBA/OrbFunctional$2.h	(revision 155473)
+++ gnu/CORBA/OrbFunctional$2.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   OrbFunctional$2(::gnu::CORBA::OrbFunctional *, ::gnu::CORBA::OrbFunctional$portServer *, ::java::net::Socket *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 private:
Index: gnu/CORBA/gnuRequest$2.h
===================================================================
--- gnu/CORBA/gnuRequest$2.h	(revision 155473)
+++ gnu/CORBA/gnuRequest$2.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   gnuRequest$2(::gnu::CORBA::gnuRequest *, ::gnu::CORBA::gnuRequest *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 private:
Index: gnu/CORBA/NamingService/NamingServiceTransient$1.h
===================================================================
--- gnu/CORBA/NamingService/NamingServiceTransient$1.h	(revision 155473)
+++ gnu/CORBA/NamingService/NamingServiceTransient$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   NamingServiceTransient$1(::gnu::CORBA::OrbFunctional *);
 public:
-  void run();
+  virtual void run();
 private:
   ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) val$orb;
 public:
Index: gnu/CORBA/OrbFunctional$1.h
===================================================================
--- gnu/CORBA/OrbFunctional$1.h	(revision 155473)
+++ gnu/CORBA/OrbFunctional$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   OrbFunctional$1(::gnu::CORBA::OrbFunctional *, ::gnu::CORBA::OrbFunctional *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 private:
Index: gnu/CORBA/gnuRequest$1.h
===================================================================
--- gnu/CORBA/gnuRequest$1.h	(revision 155473)
+++ gnu/CORBA/gnuRequest$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   gnuRequest$1(::gnu::CORBA::gnuRequest *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 public:
Index: gnu/javax/crypto/jce/GnuSasl$1.h
===================================================================
--- gnu/javax/crypto/jce/GnuSasl$1.h	(revision 155473)
+++ gnu/javax/crypto/jce/GnuSasl$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   GnuSasl$1(::gnu::javax::crypto::jce::GnuSasl *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::crypto::jce::GnuSasl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/crypto/jce/GnuCrypto$1.h
===================================================================
--- gnu/javax/crypto/jce/GnuCrypto$1.h	(revision 155473)
+++ gnu/javax/crypto/jce/GnuCrypto$1.h	(working copy)
@@ -31,7 +31,7 @@
 public: // actually package-private
   GnuCrypto$1(::gnu::javax::crypto::jce::GnuCrypto *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::crypto::jce::GnuCrypto * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/crypto/prng/CSPRNG$1.h
===================================================================
--- gnu/javax/crypto/prng/CSPRNG$1.h	(revision 155473)
+++ gnu/javax/crypto/prng/CSPRNG$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   CSPRNG$1(::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
 public:
Index: gnu/javax/net/ssl/provider/Util$1.h
===================================================================
--- gnu/javax/net/ssl/provider/Util$1.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/Util$1.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   Util$1(::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
 public:
Index: gnu/javax/net/ssl/provider/Jessie$1.h
===================================================================
--- gnu/javax/net/ssl/provider/Jessie$1.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/Jessie$1.h	(working copy)
@@ -34,7 +34,7 @@
 public: // actually package-private
   Jessie$1(::gnu::javax::net::ssl::provider::Jessie *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::net::ssl::provider::Jessie * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/net/ssl/provider/Util$2.h
===================================================================
--- gnu/javax/net/ssl/provider/Util$2.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/Util$2.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   Util$2(::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
 public:
Index: gnu/javax/net/ssl/provider/SimpleSessionContext$1.h
===================================================================
--- gnu/javax/net/ssl/provider/SimpleSessionContext$1.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/SimpleSessionContext$1.h	(working copy)
@@ -34,8 +34,8 @@
 public: // actually package-private
   SimpleSessionContext$1(::gnu::javax::net::ssl::provider::SimpleSessionContext *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
   ::gnu::javax::net::ssl::provider::SimpleSessionContext * this$0;
Index: gnu/javax/net/ssl/provider/SSLSocketImpl$1.h
===================================================================
--- gnu/javax/net/ssl/provider/SSLSocketImpl$1.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/SSLSocketImpl$1.h	(working copy)
@@ -34,7 +34,7 @@
 public: // actually package-private
   SSLSocketImpl$1(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::javax::net::ssl::provider::SSLSocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/net/ssl/provider/AbstractHandshake$1.h
===================================================================
--- gnu/javax/net/ssl/provider/AbstractHandshake$1.h	(revision 155473)
+++ gnu/javax/net/ssl/provider/AbstractHandshake$1.h	(working copy)
@@ -34,8 +34,8 @@
 public: // actually package-private
   AbstractHandshake$1(::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier *);
 public:
-  ::java::lang::ClassLoader * AbstractHandshake$1$run();
-  ::java::lang::Object * run();
+  virtual ::java::lang::ClassLoader * AbstractHandshake$1$run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: gnu/javax/rmi/CORBA/RmiUtilities$2.h
===================================================================
--- gnu/javax/rmi/CORBA/RmiUtilities$2.h	(revision 155473)
+++ gnu/javax/rmi/CORBA/RmiUtilities$2.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   RmiUtilities$2();
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
   static ::java::lang::Class class$;
 };
 
Index: gnu/javax/rmi/CORBA/RmiUtilities$1.h
===================================================================
--- gnu/javax/rmi/CORBA/RmiUtilities$1.h	(revision 155473)
+++ gnu/javax/rmi/CORBA/RmiUtilities$1.h	(working copy)
@@ -30,7 +30,7 @@
 public: // actually package-private
   RmiUtilities$1();
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
   static ::java::lang::Class class$;
 };
 
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$3.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$3.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$3.h	(working copy)
@@ -63,7 +63,7 @@
 public: // actually package-private
   SwingCallbackHandler$3(::gnu::javax::security::auth::callback::SwingCallbackHandler *, JArray< ::java::lang::String * > *, ::javax::security::auth::callback::ConfirmationCallback *, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$4.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$4.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$4.h	(working copy)
@@ -62,7 +62,7 @@
 public: // actually package-private
   SwingCallbackHandler$4(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::NameCallback *, ::javax::swing::JTextField *, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$5.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$5.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$5.h	(working copy)
@@ -62,7 +62,7 @@
 public: // actually package-private
   SwingCallbackHandler$5(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::PasswordCallback *, ::javax::swing::JPasswordField *, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$6.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$6.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$6.h	(working copy)
@@ -62,7 +62,7 @@
 public: // actually package-private
   SwingCallbackHandler$6(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::TextInputCallback *, ::javax::swing::JTextArea *, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$7.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$7.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$7.h	(working copy)
@@ -61,7 +61,7 @@
 public: // actually package-private
   SwingCallbackHandler$7(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::swing::JDialog *, ::javax::security::auth::callback::TextOutputCallback *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/GnuCallbacks$1.h
===================================================================
--- gnu/javax/security/auth/callback/GnuCallbacks$1.h	(revision 155473)
+++ gnu/javax/security/auth/callback/GnuCallbacks$1.h	(working copy)
@@ -34,7 +34,7 @@
 public: // actually package-private
   GnuCallbacks$1(::gnu::javax::security::auth::callback::GnuCallbacks *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::security::auth::callback::GnuCallbacks * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$1.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$1.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$1.h	(working copy)
@@ -61,7 +61,7 @@
 public: // actually package-private
   SwingCallbackHandler$1(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::ChoiceCallback *, jint, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/security/auth/callback/SwingCallbackHandler$2.h
===================================================================
--- gnu/javax/security/auth/callback/SwingCallbackHandler$2.h	(revision 155473)
+++ gnu/javax/security/auth/callback/SwingCallbackHandler$2.h	(working copy)
@@ -62,7 +62,7 @@
 public: // actually package-private
   SwingCallbackHandler$2(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::ChoiceCallback *, ::javax::swing::JList *, jint, ::javax::swing::JDialog *);
 public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
 public: // actually package-private
   ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/swing/text/html/css/CSSParser$1.h
===================================================================
--- gnu/javax/swing/text/html/css/CSSParser$1.h	(revision 155473)
+++ gnu/javax/swing/text/html/css/CSSParser$1.h	(working copy)
@@ -39,9 +39,9 @@
 public: // actually package-private
   CSSParser$1();
 public:
-  void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
-  void endStatement();
-  void declaration(::java::lang::String *, ::java::lang::String *);
+  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
+  virtual void endStatement();
+  virtual void declaration(::java::lang::String *, ::java::lang::String *);
   static ::java::lang::Class class$;
 };
 
Index: gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h
===================================================================
--- gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h	(revision 155473)
+++ gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h	(working copy)
@@ -37,8 +37,8 @@
 public: // actually package-private
   htmlAttributeSet$1(::gnu::javax::swing::text::html::parser::htmlAttributeSet *, ::java::util::Enumeration *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::gnu::javax::swing::text::html::parser::htmlAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h
===================================================================
--- gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h	(revision 155473)
+++ gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h	(working copy)
@@ -37,8 +37,8 @@
 public: // actually package-private
   SmallHtmlAttributeSet$1(::gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
   ::gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet * this$0;
Index: gnu/javax/swing/text/html/parser/support/Parser$1.h
===================================================================
--- gnu/javax/swing/text/html/parser/support/Parser$1.h	(revision 155473)
+++ gnu/javax/swing/text/html/parser/support/Parser$1.h	(working copy)
@@ -40,7 +40,7 @@
 public: // actually package-private
   Parser$1(::gnu::javax::swing::text::html::parser::support::Parser *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::gnu::javax::swing::text::html::parser::support::Parser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: gnu/javax/swing/text/html/parser/support/Parser$2.h
===================================================================
--- gnu/javax/swing/text/html/parser/support/Parser$2.h	(revision 155473)
+++ gnu/javax/swing/text/html/parser/support/Parser$2.h	(working copy)
@@ -57,9 +57,9 @@
 public: // actually package-private
   Parser$2(::gnu::javax::swing::text::html::parser::support::Parser *, ::javax::swing::text::html::parser::DTD *);
 public: // actually protected
-  void s_error(::java::lang::String *);
-  void handleSupposedEndTag(::javax::swing::text::html::parser::Element *);
-  void handleSupposedStartTag(::javax::swing::text::html::parser::Element *);
+  virtual void s_error(::java::lang::String *);
+  virtual void handleSupposedEndTag(::javax::swing::text::html::parser::Element *);
+  virtual void handleSupposedStartTag(::javax::swing::text::html::parser::Element *);
 public: // actually package-private
   ::gnu::javax::swing::text::html::parser::support::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::htmlValidator)))) this$0;
 public:
Index: gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h
===================================================================
--- gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h	(revision 155473)
+++ gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h	(working copy)
@@ -33,7 +33,7 @@
 public: // actually package-private
   DSSIMidiDeviceProvider$1();
 public:
-  jboolean accept(::java::io::File *, ::java::lang::String *);
+  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
   static ::java::lang::Class class$;
 };
 
Index: gnu/javax/naming/giop/GiopNamingServiceFactory$1.h
===================================================================
--- gnu/javax/naming/giop/GiopNamingServiceFactory$1.h	(revision 155473)
+++ gnu/javax/naming/giop/GiopNamingServiceFactory$1.h	(working copy)
@@ -41,7 +41,7 @@
 public: // actually package-private
   GiopNamingServiceFactory$1(::gnu::javax::naming::giop::GiopNamingServiceFactory *, ::org::omg::CORBA::ORB *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::gnu::javax::naming::giop::GiopNamingServiceFactory * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 private:
Index: java/lang/Class$1.h
===================================================================
--- java/lang/Class$1.h	(revision 155473)
+++ java/lang/Class$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Class$1(::java::lang::reflect::AccessibleObject *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::reflect::AccessibleObject * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$obj;
 public:
Index: java/lang/SecurityManager$1.h
===================================================================
--- java/lang/SecurityManager$1.h	(revision 155473)
+++ java/lang/SecurityManager$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   SecurityManager$1(::java::lang::SecurityManager *, ::java::lang::String *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::lang::SecurityManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/nio/charset/CoderResult$1.h
===================================================================
--- java/nio/charset/CoderResult$1.h	(revision 155473)
+++ java/nio/charset/CoderResult$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   CoderResult$1();
 public: // actually protected
-  ::java::nio::charset::CoderResult * make(jint);
+  virtual ::java::nio::charset::CoderResult * make(jint);
 public:
   static ::java::lang::Class class$;
 };
Index: java/nio/charset/CoderResult$2.h
===================================================================
--- java/nio/charset/CoderResult$2.h	(revision 155473)
+++ java/nio/charset/CoderResult$2.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   CoderResult$2();
 public: // actually protected
-  ::java::nio::charset::CoderResult * make(jint);
+  virtual ::java::nio::charset::CoderResult * make(jint);
 public:
   static ::java::lang::Class class$;
 };
Index: java/net/URLClassLoader$2.h
===================================================================
--- java/net/URLClassLoader$2.h	(revision 155473)
+++ java/net/URLClassLoader$2.h	(working copy)
@@ -25,8 +25,8 @@
 public: // actually package-private
   URLClassLoader$2(::java::lang::ClassLoader *, ::java::lang::Object *);
 public:
-  ::java::net::URLClassLoader * URLClassLoader$2$run();
-  ::java::lang::Object * run();
+  virtual ::java::net::URLClassLoader * URLClassLoader$2$run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$parent;
   ::java::lang::Object * val$securityContext;
Index: java/net/URL$1.h
===================================================================
--- java/net/URL$1.h	(revision 155473)
+++ java/net/URL$1.h	(working copy)
@@ -24,8 +24,8 @@
 public: // actually package-private
   URL$1();
 public:
-  ::java::lang::ClassLoader * URL$1$run();
-  ::java::lang::Object * run();
+  virtual ::java::lang::ClassLoader * URL$1$run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/net/URLClassLoader$1.h
===================================================================
--- java/net/URLClassLoader$1.h	(revision 155473)
+++ java/net/URLClassLoader$1.h	(working copy)
@@ -31,8 +31,8 @@
 public: // actually package-private
   URLClassLoader$1(::java::net::URLClassLoader *, ::java::lang::String *, JArray< jbyte > *, ::java::security::CodeSource *);
 public:
-  ::java::lang::Class * URLClassLoader$1$run();
-  ::java::lang::Object * run();
+  virtual ::java::lang::Class * URLClassLoader$1$run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/io/ObjectStreamField$1.h
===================================================================
--- java/io/ObjectStreamField$1.h	(revision 155473)
+++ java/io/ObjectStreamField$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ObjectStreamField$1(::java::io::ObjectStreamField *, ::java::lang::reflect::Field *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::io::ObjectStreamField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/io/ObjectStreamClass$1.h
===================================================================
--- java/io/ObjectStreamClass$1.h	(revision 155473)
+++ java/io/ObjectStreamClass$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ObjectStreamClass$1(::java::io::ObjectStreamClass *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::java::io::ObjectStreamClass * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: java/io/DeleteFileHelper$1.h
===================================================================
--- java/io/DeleteFileHelper$1.h	(revision 155473)
+++ java/io/DeleteFileHelper$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   DeleteFileHelper$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/io/ObjectOutputStream$1.h
===================================================================
--- java/io/ObjectOutputStream$1.h	(revision 155473)
+++ java/io/ObjectOutputStream$1.h	(working copy)
@@ -18,16 +18,16 @@
 private:
   ::java::io::ObjectStreamField * getField(::java::lang::String *);
 public:
-  void put(::java::lang::String *, jboolean);
-  void put(::java::lang::String *, jbyte);
-  void put(::java::lang::String *, jchar);
-  void put(::java::lang::String *, jdouble);
-  void put(::java::lang::String *, jfloat);
-  void put(::java::lang::String *, jint);
-  void put(::java::lang::String *, jlong);
-  void put(::java::lang::String *, jshort);
-  void put(::java::lang::String *, ::java::lang::Object *);
-  void write(::java::io::ObjectOutput *);
+  virtual void put(::java::lang::String *, jboolean);
+  virtual void put(::java::lang::String *, jbyte);
+  virtual void put(::java::lang::String *, jchar);
+  virtual void put(::java::lang::String *, jdouble);
+  virtual void put(::java::lang::String *, jfloat);
+  virtual void put(::java::lang::String *, jint);
+  virtual void put(::java::lang::String *, jlong);
+  virtual void put(::java::lang::String *, jshort);
+  virtual void put(::java::lang::String *, ::java::lang::Object *);
+  virtual void write(::java::io::ObjectOutput *);
 private:
   void checkType(::java::io::ObjectStreamField *, jchar);
   JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::ObjectOutputStream$PutField)))) prim_field_data;
Index: java/io/ObjectInputStream$2.h
===================================================================
--- java/io/ObjectInputStream$2.h	(revision 155473)
+++ java/io/ObjectInputStream$2.h	(working copy)
@@ -16,17 +16,17 @@
 public: // actually package-private
   ObjectInputStream$2(::java::io::ObjectInputStream *, ::java::io::ObjectStreamClass *, JArray< jbyte > *, JArray< ::java::lang::Object * > *);
 public:
-  ::java::io::ObjectStreamClass * getObjectStreamClass();
-  jboolean defaulted(::java::lang::String *);
-  jboolean get(::java::lang::String *, jboolean);
-  jchar get(::java::lang::String *, jchar);
-  jbyte get(::java::lang::String *, jbyte);
-  jshort get(::java::lang::String *, jshort);
-  jint get(::java::lang::String *, jint);
-  jlong get(::java::lang::String *, jlong);
-  jfloat get(::java::lang::String *, jfloat);
-  jdouble get(::java::lang::String *, jdouble);
-  ::java::lang::Object * get(::java::lang::String *, ::java::lang::Object *);
+  virtual ::java::io::ObjectStreamClass * getObjectStreamClass();
+  virtual jboolean defaulted(::java::lang::String *);
+  virtual jboolean get(::java::lang::String *, jboolean);
+  virtual jchar get(::java::lang::String *, jchar);
+  virtual jbyte get(::java::lang::String *, jbyte);
+  virtual jshort get(::java::lang::String *, jshort);
+  virtual jint get(::java::lang::String *, jint);
+  virtual jlong get(::java::lang::String *, jlong);
+  virtual jfloat get(::java::lang::String *, jfloat);
+  virtual jdouble get(::java::lang::String *, jdouble);
+  virtual ::java::lang::Object * get(::java::lang::String *, ::java::lang::Object *);
 private:
   ::java::io::ObjectStreamField * getField(::java::lang::String *, ::java::lang::Class *);
 public: // actually package-private
Index: java/io/ObjectStreamClass$2.h
===================================================================
--- java/io/ObjectStreamClass$2.h	(revision 155473)
+++ java/io/ObjectStreamClass$2.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ObjectStreamClass$2(::java::io::ObjectStreamClass *, ::java::lang::reflect::Constructor *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::io::ObjectStreamClass * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/io/ObjectInputStream$1.h
===================================================================
--- java/io/ObjectInputStream$1.h	(revision 155473)
+++ java/io/ObjectInputStream$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ObjectInputStream$1(::java::io::ObjectInputStream *, ::java::lang::Class *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::io::ObjectInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/security/Permissions$1.h
===================================================================
--- java/security/Permissions$1.h	(revision 155473)
+++ java/security/Permissions$1.h	(working copy)
@@ -25,8 +25,8 @@
 public: // actually package-private
   Permissions$1(::java::security::Permissions *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
   ::java::util::Enumeration * sub_enum;
Index: java/security/UnresolvedPermissionCollection$1.h
===================================================================
--- java/security/UnresolvedPermissionCollection$1.h	(revision 155473)
+++ java/security/UnresolvedPermissionCollection$1.h	(working copy)
@@ -25,8 +25,8 @@
 public: // actually package-private
   UnresolvedPermissionCollection$1(::java::security::UnresolvedPermissionCollection *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
   ::java::util::Enumeration * sub_enum;
Index: java/security/cert/CertStore$1.h
===================================================================
--- java/security/cert/CertStore$1.h	(revision 155473)
+++ java/security/cert/CertStore$1.h	(working copy)
@@ -27,7 +27,7 @@
 public: // actually package-private
   CertStore$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/security/cert/CertPathValidator$1.h
===================================================================
--- java/security/cert/CertPathValidator$1.h	(revision 155473)
+++ java/security/cert/CertPathValidator$1.h	(working copy)
@@ -27,7 +27,7 @@
 public: // actually package-private
   CertPathValidator$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/beans/Encoder$1.h
===================================================================
--- java/beans/Encoder$1.h	(revision 155473)
+++ java/beans/Encoder$1.h	(working copy)
@@ -26,7 +26,7 @@
 public: // actually package-private
   Encoder$1();
 public: // actually protected
-  ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
+  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
 public:
   static ::java::lang::Class class$;
 };
Index: java/awt/datatransfer/SystemFlavorMap$1.h
===================================================================
--- java/awt/datatransfer/SystemFlavorMap$1.h	(revision 155473)
+++ java/awt/datatransfer/SystemFlavorMap$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   SystemFlavorMap$1(::java::awt::datatransfer::SystemFlavorMap *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::awt::datatransfer::SystemFlavorMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: java/awt/AWTKeyStroke$2.h
===================================================================
--- java/awt/AWTKeyStroke$2.h	(revision 155473)
+++ java/awt/AWTKeyStroke$2.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   AWTKeyStroke$2();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/awt/geom/Rectangle2D$1.h
===================================================================
--- java/awt/geom/Rectangle2D$1.h	(revision 155473)
+++ java/awt/geom/Rectangle2D$1.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   Rectangle2D$1(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jdouble, jdouble, ::java::awt::geom::AffineTransform *);
 public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
 public: // actually package-private
Index: java/awt/geom/Line2D$1.h
===================================================================
--- java/awt/geom/Line2D$1.h	(revision 155473)
+++ java/awt/geom/Line2D$1.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   Line2D$1(::java::awt::geom::Line2D *, ::java::awt::geom::AffineTransform *);
 public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
 public: // actually package-private
Index: java/awt/geom/CubicCurve2D$1.h
===================================================================
--- java/awt/geom/CubicCurve2D$1.h	(revision 155473)
+++ java/awt/geom/CubicCurve2D$1.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   CubicCurve2D$1(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::AffineTransform *);
 public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
 public: // actually package-private
Index: java/awt/geom/QuadCurve2D$1.h
===================================================================
--- java/awt/geom/QuadCurve2D$1.h	(revision 155473)
+++ java/awt/geom/QuadCurve2D$1.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   QuadCurve2D$1(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::AffineTransform *);
 public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
 public: // actually package-private
Index: java/awt/geom/RoundRectangle2D$1.h
===================================================================
--- java/awt/geom/RoundRectangle2D$1.h	(revision 155473)
+++ java/awt/geom/RoundRectangle2D$1.h	(working copy)
@@ -33,11 +33,11 @@
 public: // actually package-private
   RoundRectangle2D$1(::java::awt::geom::RoundRectangle2D *, ::java::awt::geom::AffineTransform *);
 public:
-  jint currentSegment(JArray< jdouble > *);
-  jint currentSegment(JArray< jfloat > *);
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
+  virtual jint currentSegment(JArray< jdouble > *);
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
 public: // actually package-private
   jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
   jdouble y;
Index: java/awt/Robot$1.h
===================================================================
--- java/awt/Robot$1.h	(revision 155473)
+++ java/awt/Robot$1.h	(working copy)
@@ -25,7 +25,7 @@
 public: // actually package-private
   Robot$1(::java::awt::Robot *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::java::awt::Robot * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 public:
Index: java/awt/AWTKeyStroke$3.h
===================================================================
--- java/awt/AWTKeyStroke$3.h	(revision 155473)
+++ java/awt/AWTKeyStroke$3.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   AWTKeyStroke$3(::java::lang::Class *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 private:
   ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$subclass;
 public:
Index: java/awt/image/PixelGrabber$1.h
===================================================================
--- java/awt/image/PixelGrabber$1.h	(revision 155473)
+++ java/awt/image/PixelGrabber$1.h	(working copy)
@@ -28,7 +28,7 @@
 public: // actually package-private
   PixelGrabber$1(::java::awt::image::PixelGrabber *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::java::awt::image::PixelGrabber * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
 public:
Index: java/awt/image/BufferedImage$1.h
===================================================================
--- java/awt/image/BufferedImage$1.h	(revision 155473)
+++ java/awt/image/BufferedImage$1.h	(working copy)
@@ -29,11 +29,11 @@
 public: // actually package-private
   BufferedImage$1(::java::awt::image::BufferedImage *);
 public:
-  void addConsumer(::java::awt::image::ImageConsumer *);
-  jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  void removeConsumer(::java::awt::image::ImageConsumer *);
-  void startProduction(::java::awt::image::ImageConsumer *);
-  void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
+  virtual void addConsumer(::java::awt::image::ImageConsumer *);
+  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
+  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
+  virtual void startProduction(::java::awt::image::ImageConsumer *);
+  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
 public: // actually package-private
   ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
   ::java::awt::image::BufferedImage * this$0;
Index: java/awt/AlphaComposite$1.h
===================================================================
--- java/awt/AlphaComposite$1.h	(revision 155473)
+++ java/awt/AlphaComposite$1.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   AlphaComposite$1(jint, jfloat, jboolean);
 public: // actually protected
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
+  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
 private:
   static const jint MAX_CACHE_SIZE = 2048;
 public:
Index: java/awt/Toolkit$1.h
===================================================================
--- java/awt/Toolkit$1.h	(revision 155473)
+++ java/awt/Toolkit$1.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   Toolkit$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/awt/Polygon$1.h
===================================================================
--- java/awt/Polygon$1.h	(revision 155473)
+++ java/awt/Polygon$1.h	(working copy)
@@ -31,11 +31,11 @@
 public: // actually package-private
   Polygon$1(::java::awt::Polygon *, ::java::awt::geom::AffineTransform *);
 public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) vertex;
 public: // actually package-private
Index: java/awt/Toolkit$2.h
===================================================================
--- java/awt/Toolkit$2.h	(revision 155473)
+++ java/awt/Toolkit$2.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   Toolkit$2();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/awt/AWTKeyStroke$1.h
===================================================================
--- java/awt/AWTKeyStroke$1.h	(revision 155473)
+++ java/awt/AWTKeyStroke$1.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   AWTKeyStroke$1(jint, jfloat, jboolean);
 public: // actually protected
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
+  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
 private:
   static const jint MAX_CACHE_SIZE = 2048;
 public:
Index: java/util/AbstractMap$4.h
===================================================================
--- java/util/AbstractMap$4.h	(revision 155473)
+++ java/util/AbstractMap$4.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   AbstractMap$4(::java::util::AbstractMap$3 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map_iterator;
 public: // actually package-private
Index: java/util/concurrent/TimeUnit$7.h
===================================================================
--- java/util/concurrent/TimeUnit$7.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$7.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$7(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/CopyOnWriteArrayList$2.h
===================================================================
--- java/util/concurrent/CopyOnWriteArrayList$2.h	(revision 155473)
+++ java/util/concurrent/CopyOnWriteArrayList$2.h	(working copy)
@@ -16,9 +16,9 @@
 public: // actually package-private
   CopyOnWriteArrayList$2(::java::util::concurrent::CopyOnWriteArrayList *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iteratorData;
   jint currentElement;
Index: java/util/concurrent/Executors$2.h
===================================================================
--- java/util/concurrent/Executors$2.h	(revision 155473)
+++ java/util/concurrent/Executors$2.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Executors$2(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: java/util/concurrent/Executors$6.h
===================================================================
--- java/util/concurrent/Executors$6.h	(revision 155473)
+++ java/util/concurrent/Executors$6.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   Executors$6(::java::security::PrivilegedExceptionAction *);
 public:
-  ::java::lang::Object * call();
+  virtual ::java::lang::Object * call();
 private:
   ::java::security::PrivilegedExceptionAction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$action;
 public:
Index: java/util/concurrent/TimeUnit$4.h
===================================================================
--- java/util/concurrent/TimeUnit$4.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$4.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$4(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/CopyOnWriteArrayList$3.h
===================================================================
--- java/util/concurrent/CopyOnWriteArrayList$3.h	(revision 155473)
+++ java/util/concurrent/CopyOnWriteArrayList$3.h	(working copy)
@@ -16,15 +16,15 @@
 public: // actually package-private
   CopyOnWriteArrayList$3(::java::util::concurrent::CopyOnWriteArrayList *, jint);
 public:
-  void add(::java::lang::Object *);
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  jint nextIndex();
-  ::java::lang::Object * previous();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
+  virtual void add(::java::lang::Object *);
+  virtual jboolean hasNext();
+  virtual jboolean hasPrevious();
+  virtual ::java::lang::Object * next();
+  virtual jint nextIndex();
+  virtual ::java::lang::Object * previous();
+  virtual jint previousIndex();
+  virtual void remove();
+  virtual void set(::java::lang::Object *);
 public: // actually package-private
   JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iteratorData;
   jint currentElement;
Index: java/util/concurrent/Executors$3.h
===================================================================
--- java/util/concurrent/Executors$3.h	(revision 155473)
+++ java/util/concurrent/Executors$3.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Executors$3(::java::util::concurrent::Executors$PrivilegedThreadFactory *, ::java::lang::Runnable *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   static ::java::util::concurrent::Executors$PrivilegedThreadFactory * access$0(::java::util::concurrent::Executors$3 *);
   ::java::util::concurrent::Executors$PrivilegedThreadFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
Index: java/util/concurrent/TimeUnit$1.h
===================================================================
--- java/util/concurrent/TimeUnit$1.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$1.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$1(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/TimeUnit$5.h
===================================================================
--- java/util/concurrent/TimeUnit$5.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$5.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$5(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/Executors$4.h
===================================================================
--- java/util/concurrent/Executors$4.h	(revision 155473)
+++ java/util/concurrent/Executors$4.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Executors$4(::java::util::concurrent::Executors$3 *, ::java::lang::Runnable *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::util::concurrent::Executors$3 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$2;
 private:
Index: java/util/concurrent/TimeUnit$2.h
===================================================================
--- java/util/concurrent/TimeUnit$2.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$2.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$2(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/ScheduledThreadPoolExecutor$1.h
===================================================================
--- java/util/concurrent/ScheduledThreadPoolExecutor$1.h	(revision 155473)
+++ java/util/concurrent/ScheduledThreadPoolExecutor$1.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
 public:
-  jboolean hasNext();
-  ::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next();
-  void remove();
-  ::java::lang::Object * next();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next();
+  virtual void remove();
+  virtual ::java::lang::Object * next();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
 public: // actually package-private
Index: java/util/concurrent/TimeUnit$6.h
===================================================================
--- java/util/concurrent/TimeUnit$6.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$6.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$6(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/concurrent/CopyOnWriteArrayList$1.h
===================================================================
--- java/util/concurrent/CopyOnWriteArrayList$1.h	(revision 155473)
+++ java/util/concurrent/CopyOnWriteArrayList$1.h	(working copy)
@@ -14,15 +14,15 @@
 public: // actually package-private
   CopyOnWriteArrayList$1(::java::util::concurrent::CopyOnWriteArrayList$SubList *, jint);
 public:
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  jint nextIndex();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
-  void add(::java::lang::Object *);
+  virtual jboolean hasNext();
+  virtual jboolean hasPrevious();
+  virtual ::java::lang::Object * next();
+  virtual ::java::lang::Object * previous();
+  virtual jint nextIndex();
+  virtual jint previousIndex();
+  virtual void remove();
+  virtual void set(::java::lang::Object *);
+  virtual void add(::java::lang::Object *);
 private:
   ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
   jint position;
Index: java/util/concurrent/Executors$1.h
===================================================================
--- java/util/concurrent/Executors$1.h	(revision 155473)
+++ java/util/concurrent/Executors$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Executors$1(::java::util::concurrent::Executors$PrivilegedCallable *);
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
 public: // actually package-private
   ::java::util::concurrent::Executors$PrivilegedCallable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: java/util/concurrent/Executors$5.h
===================================================================
--- java/util/concurrent/Executors$5.h	(revision 155473)
+++ java/util/concurrent/Executors$5.h	(working copy)
@@ -24,7 +24,7 @@
 public: // actually package-private
   Executors$5(::java::security::PrivilegedAction *);
 public:
-  ::java::lang::Object * call();
+  virtual ::java::lang::Object * call();
 private:
   ::java::security::PrivilegedAction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$action;
 public:
Index: java/util/concurrent/TimeUnit$3.h
===================================================================
--- java/util/concurrent/TimeUnit$3.h	(revision 155473)
+++ java/util/concurrent/TimeUnit$3.h	(working copy)
@@ -14,16 +14,16 @@
 public: // actually package-private
   TimeUnit$3(::java::lang::String *, jint);
 public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jlong toNanos(jlong);
+  virtual jlong toMicros(jlong);
+  virtual jlong toMillis(jlong);
+  virtual jlong toSeconds(jlong);
+  virtual jlong toMinutes(jlong);
+  virtual jlong toHours(jlong);
+  virtual jlong toDays(jlong);
+  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
 public: // actually package-private
-  jint excessNanos(jlong, jlong);
+  virtual jint excessNanos(jlong, jlong);
 public:
   static ::java::lang::Class class$;
 };
Index: java/util/Collections$1.h
===================================================================
--- java/util/Collections$1.h	(revision 155473)
+++ java/util/Collections$1.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   Collections$1(::java::util::Collections$SingletonSet *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasNext__;
 public: // actually package-private
Index: java/util/Collections$5.h
===================================================================
--- java/util/Collections$5.h	(revision 155473)
+++ java/util/Collections$5.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   Collections$5(::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * Collections$5$next();
-  ::java::lang::Object * next();
+  virtual ::java::util::Map$Entry * Collections$5$next();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) this$2;
 public:
Index: java/util/HashMap$3.h
===================================================================
--- java/util/HashMap$3.h	(revision 155473)
+++ java/util/HashMap$3.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   HashMap$3(::java::util::HashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/Collections$9.h
===================================================================
--- java/util/Collections$9.h	(revision 155473)
+++ java/util/Collections$9.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Collections$9(::java::util::Comparator *);
 public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 private:
   ::java::util::Comparator * __attribute__((aligned(__alignof__( ::java::util::Collections$ReverseComparator)))) val$c;
 public:
Index: java/util/WeakHashMap$1.h
===================================================================
--- java/util/WeakHashMap$1.h	(revision 155473)
+++ java/util/WeakHashMap$1.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   WeakHashMap$1();
 public:
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
   static ::java::lang::Class class$;
 };
 
Index: java/util/IdentityHashMap$2.h
===================================================================
--- java/util/IdentityHashMap$2.h	(revision 155473)
+++ java/util/IdentityHashMap$2.h	(working copy)
@@ -14,12 +14,12 @@
 public: // actually package-private
   IdentityHashMap$2(::java::util::IdentityHashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jint hashCode();
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/TreeMap$1.h
===================================================================
--- java/util/TreeMap$1.h	(revision 155473)
+++ java/util/TreeMap$1.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   TreeMap$1(::java::util::TreeMap$SubMap$NavigableEntrySet *);
 public:
-  jint TreeMap$1$compare(::java::util::Map$Entry *, ::java::util::Map$Entry *);
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint TreeMap$1$compare(::java::util::Map$Entry *, ::java::util::Map$Entry *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::java::util::TreeMap$SubMap$NavigableEntrySet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$2;
 public:
Index: java/util/TreeMap$5.h
===================================================================
--- java/util/TreeMap$5.h	(revision 155473)
+++ java/util/TreeMap$5.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   TreeMap$5(::java::util::TreeMap$DescendingSet *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) last;
   ::java::lang::Object * next__;
Index: java/util/LinkedList$1.h
===================================================================
--- java/util/LinkedList$1.h	(revision 155473)
+++ java/util/LinkedList$1.h	(working copy)
@@ -16,9 +16,9 @@
 private:
   void checkMod();
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) knownMod;
   ::java::util::LinkedList$Entry * next__;
Index: java/util/EnumMap$2.h
===================================================================
--- java/util/EnumMap$2.h	(revision 155473)
+++ java/util/EnumMap$2.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   EnumMap$2(::java::util::EnumMap$1 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Enum * EnumMap$2$next();
-  void remove();
-  ::java::lang::Object * next();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Enum * EnumMap$2$next();
+  virtual void remove();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
   jint index;
Index: java/util/EnumMap$6.h
===================================================================
--- java/util/EnumMap$6.h	(revision 155473)
+++ java/util/EnumMap$6.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   EnumMap$6(::java::util::EnumMap$5 *);
 public:
-  jboolean hasNext();
-  ::java::util::Map$Entry * EnumMap$6$next();
-  void remove();
-  ::java::lang::Object * next();
+  virtual jboolean hasNext();
+  virtual ::java::util::Map$Entry * EnumMap$6$next();
+  virtual void remove();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   static ::java::util::EnumMap$5 * access$1(::java::util::EnumMap$6 *);
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
Index: java/util/LinkedHashMap$1.h
===================================================================
--- java/util/LinkedHashMap$1.h	(revision 155473)
+++ java/util/LinkedHashMap$1.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   LinkedHashMap$1(::java::util::LinkedHashMap *, jint);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   ::java::util::LinkedHashMap$LinkedHashEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
   ::java::util::LinkedHashMap$LinkedHashEntry * last;
Index: java/util/EnumSet$2.h
===================================================================
--- java/util/EnumSet$2.h	(revision 155473)
+++ java/util/EnumSet$2.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   EnumSet$2(::java::util::EnumSet$1 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Enum * EnumSet$2$next();
-  void remove();
-  ::java::lang::Object * next();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Enum * EnumSet$2$next();
+  virtual void remove();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) next__;
   jint count;
Index: java/util/ResourceBundle$1.h
===================================================================
--- java/util/ResourceBundle$1.h	(revision 155473)
+++ java/util/ResourceBundle$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ResourceBundle$1(jint, jfloat, jboolean);
 public:
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
+  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
   static ::java::lang::Class class$;
 };
 
Index: java/util/TimeZone$1.h
===================================================================
--- java/util/TimeZone$1.h	(revision 155473)
+++ java/util/TimeZone$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   TimeZone$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/util/AbstractList$2.h
===================================================================
--- java/util/AbstractList$2.h	(revision 155473)
+++ java/util/AbstractList$2.h	(working copy)
@@ -16,9 +16,9 @@
 private:
   void checkMod();
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
   jint size;
Index: java/util/AbstractMap$1.h
===================================================================
--- java/util/AbstractMap$1.h	(revision 155473)
+++ java/util/AbstractMap$1.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   AbstractMap$1(::java::util::AbstractMap *);
 public:
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
+  virtual jint size();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual ::java::util::Iterator * iterator();
 public: // actually package-private
   static ::java::util::AbstractMap * access$0(::java::util::AbstractMap$1 *);
   ::java::util::AbstractMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
Index: java/util/Collections$2.h
===================================================================
--- java/util/Collections$2.h	(revision 155473)
+++ java/util/Collections$2.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Collections$2(::java::util::Collections$SingletonMap *, ::java::lang::Object *, ::java::lang::Object *);
 public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * setValue(::java::lang::Object *);
 public: // actually package-private
   ::java::util::Collections$SingletonMap * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) this$1;
 public:
Index: java/util/Collections$6.h
===================================================================
--- java/util/Collections$6.h	(revision 155473)
+++ java/util/Collections$6.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Collections$6(::java::util::Collections$CheckedMap$CheckedEntrySet *, ::java::util::Iterator *, ::java::lang::Class *);
 public:
-  ::java::lang::Object * next();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   static ::java::util::Collections$CheckedMap$CheckedEntrySet * access$0(::java::util::Collections$6 *);
   ::java::util::Collections$CheckedMap$CheckedEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedIterator)))) this$2;
Index: java/util/WeakHashMap$2.h
===================================================================
--- java/util/WeakHashMap$2.h	(revision 155473)
+++ java/util/WeakHashMap$2.h	(working copy)
@@ -17,9 +17,9 @@
   void checkMod();
   ::java::util::WeakHashMap$WeakBucket$WeakEntry * findNext(::java::util::WeakHashMap$WeakBucket$WeakEntry *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   ::java::util::WeakHashMap$WeakBucket$WeakEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastEntry;
   ::java::util::WeakHashMap$WeakBucket$WeakEntry * nextEntry;
Index: java/util/IdentityHashMap$3.h
===================================================================
--- java/util/IdentityHashMap$3.h	(revision 155473)
+++ java/util/IdentityHashMap$3.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   IdentityHashMap$3(::java::util::IdentityHashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
 public:
Index: java/util/TreeMap$2.h
===================================================================
--- java/util/TreeMap$2.h	(revision 155473)
+++ java/util/TreeMap$2.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   TreeMap$2(::java::util::TreeMap$SubMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   ::java::util::TreeMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$1;
 public:
Index: java/util/TreeMap$6.h
===================================================================
--- java/util/TreeMap$6.h	(revision 155473)
+++ java/util/TreeMap$6.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   TreeMap$6(::java::util::TreeMap$NavigableEntrySet *);
 public:
-  jint TreeMap$6$compare(::java::util::Map$Entry *, ::java::util::Map$Entry *);
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint TreeMap$6$compare(::java::util::Map$Entry *, ::java::util::Map$Entry *);
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::java::util::TreeMap$NavigableEntrySet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
 public:
Index: java/util/EnumMap$3.h
===================================================================
--- java/util/EnumMap$3.h	(revision 155473)
+++ java/util/EnumMap$3.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   EnumMap$3(::java::util::EnumMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   static ::java::util::EnumMap * access$0(::java::util::EnumMap$3 *);
   ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
Index: java/util/EnumMap$7.h
===================================================================
--- java/util/EnumMap$7.h	(revision 155473)
+++ java/util/EnumMap$7.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   EnumMap$7(::java::util::EnumMap$6 *, ::java::lang::Enum *, ::java::lang::Object *);
 public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * setValue(::java::lang::Object *);
 public: // actually package-private
   ::java::util::EnumMap$6 * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) this$2;
 public:
Index: java/util/logging/LogManager$1.h
===================================================================
--- java/util/logging/LogManager$1.h	(revision 155473)
+++ java/util/logging/LogManager$1.h	(working copy)
@@ -14,10 +14,10 @@
 public: // actually package-private
   LogManager$1();
 public:
-  ::java::lang::String * getLoggerLevel(::java::lang::String *);
-  ::java::util::List * getLoggerNames();
-  ::java::lang::String * getParentLoggerName(::java::lang::String *);
-  void setLoggerLevel(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * getLoggerLevel(::java::lang::String *);
+  virtual ::java::util::List * getLoggerNames();
+  virtual ::java::lang::String * getParentLoggerName(::java::lang::String *);
+  virtual void setLoggerLevel(::java::lang::String *, ::java::lang::String *);
   static ::java::lang::Class class$;
 };
 
Index: java/util/logging/Logger$1.h
===================================================================
--- java/util/logging/Logger$1.h	(revision 155473)
+++ java/util/logging/Logger$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Logger$1();
 public:
-  ::java::lang::Object * run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/util/Hashtable$1.h
===================================================================
--- java/util/Hashtable$1.h	(revision 155473)
+++ java/util/Hashtable$1.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   Hashtable$1(::java::util::Hashtable *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/AbstractList$3.h
===================================================================
--- java/util/AbstractList$3.h	(revision 155473)
+++ java/util/AbstractList$3.h	(working copy)
@@ -16,15 +16,15 @@
 private:
   void checkMod();
 public:
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  jint nextIndex();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
-  void add(::java::lang::Object *);
+  virtual jboolean hasNext();
+  virtual jboolean hasPrevious();
+  virtual ::java::lang::Object * next();
+  virtual ::java::lang::Object * previous();
+  virtual jint nextIndex();
+  virtual jint previousIndex();
+  virtual void remove();
+  virtual void set(::java::lang::Object *);
+  virtual void add(::java::lang::Object *);
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) knownMod;
   jint position;
Index: java/util/AbstractMap$2.h
===================================================================
--- java/util/AbstractMap$2.h	(revision 155473)
+++ java/util/AbstractMap$2.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   AbstractMap$2(::java::util::AbstractMap$1 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map_iterator;
 public: // actually package-private
Index: java/util/Collections$3.h
===================================================================
--- java/util/Collections$3.h	(revision 155473)
+++ java/util/Collections$3.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   Collections$3(::java::util::Collections$SynchronizedMap *, ::java::lang::Object *, ::java::util::Set *);
 public:
-  ::java::util::Iterator * iterator();
+  virtual ::java::util::Iterator * iterator();
 public: // actually package-private
   static ::java::util::Collections$SynchronizedMap * access$0(::java::util::Collections$3 *);
   ::java::util::Collections$SynchronizedMap * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedSet)))) this$1;
Index: java/util/HashMap$1.h
===================================================================
--- java/util/HashMap$1.h	(revision 155473)
+++ java/util/HashMap$1.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   HashMap$1(::java::util::HashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/Collections$7.h
===================================================================
--- java/util/Collections$7.h	(revision 155473)
+++ java/util/Collections$7.h	(working copy)
@@ -14,12 +14,12 @@
 public: // actually package-private
   Collections$7(::java::util::Collections$6 *, ::java::util::Map$Entry *);
 public:
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * getKey();
-  ::java::lang::Object * getValue();
-  jint hashCode();
-  ::java::lang::Object * setValue(::java::lang::Object *);
-  ::java::lang::String * toString();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::Object * getKey();
+  virtual ::java::lang::Object * getValue();
+  virtual jint hashCode();
+  virtual ::java::lang::Object * setValue(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
 public: // actually package-private
   ::java::util::Collections$6 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$3;
 private:
Index: java/util/ServiceLoader$1.h
===================================================================
--- java/util/ServiceLoader$1.h	(revision 155473)
+++ java/util/ServiceLoader$1.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   ServiceLoader$1(::java::util::ServiceLoader *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cacheIt;
 public: // actually package-private
Index: java/util/TreeMap$3.h
===================================================================
--- java/util/TreeMap$3.h	(revision 155473)
+++ java/util/TreeMap$3.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   TreeMap$3(::java::util::TreeMap$DescendingMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   static ::java::util::TreeMap$DescendingMap * access$0(::java::util::TreeMap$3 *);
   ::java::util::TreeMap$DescendingMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$1;
Index: java/util/Vector$1.h
===================================================================
--- java/util/Vector$1.h	(revision 155473)
+++ java/util/Vector$1.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   Vector$1(::java::util::Vector *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 private:
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
 public: // actually package-private
Index: java/util/TreeMap$7.h
===================================================================
--- java/util/TreeMap$7.h	(revision 155473)
+++ java/util/TreeMap$7.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   TreeMap$7(::java::util::TreeMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
 public:
Index: java/util/EnumMap$4.h
===================================================================
--- java/util/EnumMap$4.h	(revision 155473)
+++ java/util/EnumMap$4.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   EnumMap$4(::java::util::EnumMap$3 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
   jint index;
Index: java/util/Hashtable$2.h
===================================================================
--- java/util/Hashtable$2.h	(revision 155473)
+++ java/util/Hashtable$2.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   Hashtable$2(::java::util::Hashtable *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
 public:
Index: java/util/AbstractMap$3.h
===================================================================
--- java/util/AbstractMap$3.h	(revision 155473)
+++ java/util/AbstractMap$3.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   AbstractMap$3(::java::util::AbstractMap *);
 public:
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
+  virtual jint size();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual ::java::util::Iterator * iterator();
 public: // actually package-private
   static ::java::util::AbstractMap * access$0(::java::util::AbstractMap$3 *);
   ::java::util::AbstractMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
Index: java/util/Collections$4.h
===================================================================
--- java/util/Collections$4.h	(revision 155473)
+++ java/util/Collections$4.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   Collections$4(::java::util::Collections$3 *, ::java::lang::Object *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * Collections$4$next();
-  ::java::lang::Object * next();
+  virtual ::java::util::Map$Entry * Collections$4$next();
+  virtual ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$3 * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) this$2;
 public:
Index: java/util/HashMap$2.h
===================================================================
--- java/util/HashMap$2.h	(revision 155473)
+++ java/util/HashMap$2.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   HashMap$2(::java::util::HashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
 public: // actually package-private
   ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
 public:
Index: java/util/Collections$8.h
===================================================================
--- java/util/Collections$8.h	(revision 155473)
+++ java/util/Collections$8.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   Collections$8(::java::util::Iterator *);
 public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$i;
 public:
Index: java/util/IdentityHashMap$1.h
===================================================================
--- java/util/IdentityHashMap$1.h	(revision 155473)
+++ java/util/IdentityHashMap$1.h	(working copy)
@@ -14,12 +14,12 @@
 public: // actually package-private
   IdentityHashMap$1(::java::util::IdentityHashMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jint hashCode();
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/TreeMap$4.h
===================================================================
--- java/util/TreeMap$4.h	(revision 155473)
+++ java/util/TreeMap$4.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   TreeMap$4(::java::util::TreeMap$3 *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 private:
   ::java::util::Map$Entry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) last;
   ::java::util::Map$Entry * next__;
Index: java/util/EnumMap$1.h
===================================================================
--- java/util/EnumMap$1.h	(revision 155473)
+++ java/util/EnumMap$1.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   EnumMap$1(::java::util::EnumMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   static ::java::util::EnumMap * access$0(::java::util::EnumMap$1 *);
   ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
Index: java/util/prefs/AbstractPreferences$1.h
===================================================================
--- java/util/prefs/AbstractPreferences$1.h	(revision 155473)
+++ java/util/prefs/AbstractPreferences$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   AbstractPreferences$1(::java::util::prefs::AbstractPreferences *, ::java::util::prefs::PreferenceChangeListener *, ::java::util::prefs::PreferenceChangeEvent *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/util/prefs/AbstractPreferences$2.h
===================================================================
--- java/util/prefs/AbstractPreferences$2.h	(revision 155473)
+++ java/util/prefs/AbstractPreferences$2.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   AbstractPreferences$2(::java::util::prefs::AbstractPreferences *, jboolean, ::java::util::prefs::NodeChangeListener *, ::java::util::prefs::NodeChangeEvent *);
 public:
-  void run();
+  virtual void run();
 public: // actually package-private
   ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
 private:
Index: java/util/prefs/Preferences$1.h
===================================================================
--- java/util/prefs/Preferences$1.h	(revision 155473)
+++ java/util/prefs/Preferences$1.h	(working copy)
@@ -14,8 +14,8 @@
 public: // actually package-private
   Preferences$1();
 public:
-  ::java::util::prefs::PreferencesFactory * Preferences$1$run();
-  ::java::lang::Object * run();
+  virtual ::java::util::prefs::PreferencesFactory * Preferences$1$run();
+  virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
 
Index: java/util/EnumMap$5.h
===================================================================
--- java/util/EnumMap$5.h	(revision 155473)
+++ java/util/EnumMap$5.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   EnumMap$5(::java::util::EnumMap *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   static ::java::util::EnumMap * access$0(::java::util::EnumMap$5 *);
   ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
Index: java/util/EnumSet$1.h
===================================================================
--- java/util/EnumSet$1.h	(revision 155473)
+++ java/util/EnumSet$1.h	(working copy)
@@ -14,17 +14,17 @@
 public: // actually package-private
   EnumSet$1();
 public:
-  jboolean EnumSet$1$add(::java::lang::Enum *);
-  jboolean addAll(::java::util::Collection *);
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean containsAll(::java::util::Collection *);
-  ::java::util::Iterator * iterator();
-  jboolean remove(::java::lang::Object *);
-  jboolean removeAll(::java::util::Collection *);
-  jboolean retainAll(::java::util::Collection *);
-  jint size();
-  jboolean add(::java::lang::Object *);
+  virtual jboolean EnumSet$1$add(::java::lang::Enum *);
+  virtual jboolean addAll(::java::util::Collection *);
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean containsAll(::java::util::Collection *);
+  virtual ::java::util::Iterator * iterator();
+  virtual jboolean remove(::java::lang::Object *);
+  virtual jboolean removeAll(::java::util::Collection *);
+  virtual jboolean retainAll(::java::util::Collection *);
+  virtual jint size();
+  virtual jboolean add(::java::lang::Object *);
   static ::java::lang::Class class$;
 };
 
Index: java/util/PriorityQueue$1.h
===================================================================
--- java/util/PriorityQueue$1.h	(revision 155473)
+++ java/util/PriorityQueue$1.h	(working copy)
@@ -14,9 +14,9 @@
 public: // actually package-private
   PriorityQueue$1(::java::util::PriorityQueue *);
 public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
+  virtual jboolean hasNext();
+  virtual ::java::lang::Object * next();
+  virtual void remove();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
   jint count;
Index: java/util/zip/ZipFile$1.h
===================================================================
--- java/util/zip/ZipFile$1.h	(revision 155473)
+++ java/util/zip/ZipFile$1.h	(working copy)
@@ -14,7 +14,7 @@
 public: // actually package-private
   ZipFile$1(::java::util::zip::ZipFile *, ::java::io::InputStream *, ::java::util::zip::Inflater *, jint);
 public:
-  jint available();
+  virtual jint available();
 public: // actually package-private
   ::java::util::zip::ZipFile * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) this$0;
 private:
Index: java/util/Hashtable$3.h
===================================================================
--- java/util/Hashtable$3.h	(revision 155473)
+++ java/util/Hashtable$3.h	(working copy)
@@ -14,11 +14,11 @@
 public: // actually package-private
   Hashtable$3(::java::util::Hashtable *);
 public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Iterator * iterator();
+  virtual void clear();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean remove(::java::lang::Object *);
 public: // actually package-private
   ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
 public:
Index: java/util/AbstractList$1.h
===================================================================
--- java/util/AbstractList$1.h	(revision 155473)
+++ java/util/AbstractList$1.h	(working copy)
@@ -14,15 +14,15 @@
 public: // actually package-private
   AbstractList$1(::java::util::AbstractList$SubList *, jint);
 public:
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  jint nextIndex();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
-  void add(::java::lang::Object *);
+  virtual jboolean hasNext();
+  virtual jboolean hasPrevious();
+  virtual ::java::lang::Object * next();
+  virtual ::java::lang::Object * previous();
+  virtual jint nextIndex();
+  virtual jint previousIndex();
+  virtual void remove();
+  virtual void set(::java::lang::Object *);
+  virtual void add(::java::lang::Object *);
 private:
   ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
   jint position;
