Merged gcj-eclipse branch to trunk.

From-SVN: r120621

541 files changed, 30424 insertions, 0 deletions

diff --git a/libjava/javax/swing/plaf/ActionMapUIResource.h b/libjava/javax/swing/plaf/ActionMapUIResource.h
new file mode 100644
index 00000000000..a9364d8e2d2
--- /dev/null
+++ b/libjava/javax/swing/plaf/ActionMapUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ActionMapUIResource__
+#define __javax_swing_plaf_ActionMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/ActionMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ActionMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ActionMapUIResource : public ::javax::swing::ActionMap
+{
+
+public:
+  ActionMapUIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ActionMapUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
new file mode 100644
index 00000000000..c85a1ba6ebf
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/BevelBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$BevelBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$BevelBorderUIResource : public ::javax::swing::border::BevelBorder
+{
+
+public:
+  BorderUIResource$BevelBorderUIResource(jint);
+  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
+  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = -1275542891108351642LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
new file mode 100644
index 00000000000..8161ecbe9fd
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/CompoundBorder.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource$CompoundBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$CompoundBorderUIResource : public ::javax::swing::border::CompoundBorder
+{
+
+public:
+  BorderUIResource$CompoundBorderUIResource(::javax::swing::border::Border *, ::javax::swing::border::Border *);
+private:
+  static const jlong serialVersionUID = 7550017084975167341LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
new file mode 100644
index 00000000000..15ba53faecd
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/EmptyBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$EmptyBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$EmptyBorderUIResource : public ::javax::swing::border::EmptyBorder
+{
+
+public:
+  BorderUIResource$EmptyBorderUIResource(jint, jint, jint, jint);
+  BorderUIResource$EmptyBorderUIResource(::java::awt::Insets *);
+private:
+  static const jlong serialVersionUID = -4914187529340071708LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
new file mode 100644
index 00000000000..89934717a2d
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/EtchedBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$EtchedBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$EtchedBorderUIResource : public ::javax::swing::border::EtchedBorder
+{
+
+public:
+  BorderUIResource$EtchedBorderUIResource();
+  BorderUIResource$EtchedBorderUIResource(jint);
+  BorderUIResource$EtchedBorderUIResource(::java::awt::Color *, ::java::awt::Color *);
+  BorderUIResource$EtchedBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = -8186391754165296656LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
new file mode 100644
index 00000000000..fe3669c0014
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/LineBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$LineBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$LineBorderUIResource : public ::javax::swing::border::LineBorder
+{
+
+public:
+  BorderUIResource$LineBorderUIResource(::java::awt::Color *);
+  BorderUIResource$LineBorderUIResource(::java::awt::Color *, jint);
+private:
+  static const jlong serialVersionUID = -6171232338180172310LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
new file mode 100644
index 00000000000..b5925fce775
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/MatteBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+          class BorderUIResource$MatteBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$MatteBorderUIResource : public ::javax::swing::border::MatteBorder
+{
+
+public:
+  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::java::awt::Color *);
+  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::javax::swing::Icon *);
+  BorderUIResource$MatteBorderUIResource(::javax::swing::Icon *);
+private:
+  static const jlong serialVersionUID = -8107923147541851122LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
new file mode 100644
index 00000000000..a20193f6d01
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/TitledBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource$TitledBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$TitledBorderUIResource : public ::javax::swing::border::TitledBorder
+{
+
+public:
+  BorderUIResource$TitledBorderUIResource(::java::lang::String *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = 7667113547406407427LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource.h
new file mode 100644
index 00000000000..3a89c2c00c5
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource__
+#define __javax_swing_plaf_BorderUIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource : public ::java::lang::Object
+{
+
+public:
+  static ::javax::swing::border::Border * getEtchedBorderUIResource();
+  static ::javax::swing::border::Border * getLoweredBevelBorderUIResource();
+  static ::javax::swing::border::Border * getRaisedBevelBorderUIResource();
+  static ::javax::swing::border::Border * getBlackLineBorderUIResource();
+  BorderUIResource(::javax::swing::border::Border *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+public: // actually package-private
+  static const jlong serialVersionUID = -3440553684010079691LL;
+private:
+  static ::javax::swing::border::Border * etchedBorderUIResource;
+  static ::javax::swing::border::Border * loweredBevelBorderUIResource;
+  static ::javax::swing::border::Border * raisedBevelBorderUIResource;
+  static ::javax::swing::border::Border * blackLineBorderUIResource;
+  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource__
diff --git a/libjava/javax/swing/plaf/ButtonUI.h b/libjava/javax/swing/plaf/ButtonUI.h
new file mode 100644
index 00000000000..61cb852b83c
--- /dev/null
+++ b/libjava/javax/swing/plaf/ButtonUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ButtonUI__
+#define __javax_swing_plaf_ButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ButtonUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ButtonUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ButtonUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ButtonUI__
diff --git a/libjava/javax/swing/plaf/ColorChooserUI.h b/libjava/javax/swing/plaf/ColorChooserUI.h
new file mode 100644
index 00000000000..9db0d0e891b
--- /dev/null
+++ b/libjava/javax/swing/plaf/ColorChooserUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ColorChooserUI__
+#define __javax_swing_plaf_ColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ColorChooserUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ColorChooserUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ColorChooserUI__
diff --git a/libjava/javax/swing/plaf/ColorUIResource.h b/libjava/javax/swing/plaf/ColorUIResource.h
new file mode 100644
index 00000000000..37ef2238288
--- /dev/null
+++ b/libjava/javax/swing/plaf/ColorUIResource.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ColorUIResource__
+#define __javax_swing_plaf_ColorUIResource__
+
+#pragma interface
+
+#include <java/awt/Color.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ColorUIResource : public ::java::awt::Color
+{
+
+public:
+  ColorUIResource(jint, jint, jint);
+  ColorUIResource(jint);
+  ColorUIResource(jfloat, jfloat, jfloat);
+  ColorUIResource(::java::awt::Color *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ColorUIResource__
diff --git a/libjava/javax/swing/plaf/ComboBoxUI.h b/libjava/javax/swing/plaf/ComboBoxUI.h
new file mode 100644
index 00000000000..bdcdfe3f0ea
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComboBoxUI.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComboBoxUI__
+#define __javax_swing_plaf_ComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComboBox;
+      namespace plaf
+      {
+          class ComboBoxUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComboBoxUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ComboBoxUI();
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean) = 0;
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *) = 0;
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComboBoxUI__
diff --git a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
new file mode 100644
index 00000000000..52accf48001
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComponentInputMapUIResource__
+#define __javax_swing_plaf_ComponentInputMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/ComponentInputMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentInputMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComponentInputMapUIResource : public ::javax::swing::ComponentInputMap
+{
+
+public:
+  ComponentInputMapUIResource(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComponentInputMapUIResource__
diff --git a/libjava/javax/swing/plaf/ComponentUI.h b/libjava/javax/swing/plaf/ComponentUI.h
new file mode 100644
index 00000000000..3f14af6c89e
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComponentUI.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComponentUI__
+#define __javax_swing_plaf_ComponentUI__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComponentUI : public ::java::lang::Object
+{
+
+public:
+  ComponentUI();
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComponentUI__
diff --git a/libjava/javax/swing/plaf/DesktopIconUI.h b/libjava/javax/swing/plaf/DesktopIconUI.h
new file mode 100644
index 00000000000..6f3fb24d68e
--- /dev/null
+++ b/libjava/javax/swing/plaf/DesktopIconUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DesktopIconUI__
+#define __javax_swing_plaf_DesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DesktopIconUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DesktopIconUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  DesktopIconUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DesktopIconUI__
diff --git a/libjava/javax/swing/plaf/DesktopPaneUI.h b/libjava/javax/swing/plaf/DesktopPaneUI.h
new file mode 100644
index 00000000000..308120dc131
--- /dev/null
+++ b/libjava/javax/swing/plaf/DesktopPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DesktopPaneUI__
+#define __javax_swing_plaf_DesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DesktopPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DesktopPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  DesktopPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/DimensionUIResource.h b/libjava/javax/swing/plaf/DimensionUIResource.h
new file mode 100644
index 00000000000..620a35d05c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/DimensionUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DimensionUIResource__
+#define __javax_swing_plaf_DimensionUIResource__
+
+#pragma interface
+
+#include <java/awt/Dimension.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DimensionUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DimensionUIResource : public ::java::awt::Dimension
+{
+
+public:
+  DimensionUIResource(jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DimensionUIResource__
diff --git a/libjava/javax/swing/plaf/FileChooserUI.h b/libjava/javax/swing/plaf/FileChooserUI.h
new file mode 100644
index 00000000000..3a166bac0aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/FileChooserUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_FileChooserUI__
+#define __javax_swing_plaf_FileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class FileChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::FileChooserUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  FileChooserUI();
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *) = 0;
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *) = 0;
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *) = 0;
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *) = 0;
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *) = 0;
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_FileChooserUI__
diff --git a/libjava/javax/swing/plaf/FontUIResource.h b/libjava/javax/swing/plaf/FontUIResource.h
new file mode 100644
index 00000000000..4f2b8353ba0
--- /dev/null
+++ b/libjava/javax/swing/plaf/FontUIResource.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_FontUIResource__
+#define __javax_swing_plaf_FontUIResource__
+
+#pragma interface
+
+#include <java/awt/Font.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class FontUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::FontUIResource : public ::java::awt::Font
+{
+
+public:
+  FontUIResource(::java::lang::String *, jint, jint);
+  FontUIResource(::java::awt::Font *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_FontUIResource__
diff --git a/libjava/javax/swing/plaf/IconUIResource.h b/libjava/javax/swing/plaf/IconUIResource.h
new file mode 100644
index 00000000000..f1e7047494c
--- /dev/null
+++ b/libjava/javax/swing/plaf/IconUIResource.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_IconUIResource__
+#define __javax_swing_plaf_IconUIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+          class IconUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::IconUIResource : public ::java::lang::Object
+{
+
+public:
+  IconUIResource(::javax::swing::Icon *);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+public: // actually package-private
+  static const jlong serialVersionUID = 3327049506004830542LL;
+private:
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_IconUIResource__
diff --git a/libjava/javax/swing/plaf/InputMapUIResource.h b/libjava/javax/swing/plaf/InputMapUIResource.h
new file mode 100644
index 00000000000..448fc817ee2
--- /dev/null
+++ b/libjava/javax/swing/plaf/InputMapUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InputMapUIResource__
+#define __javax_swing_plaf_InputMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/InputMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InputMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InputMapUIResource : public ::javax::swing::InputMap
+{
+
+public:
+  InputMapUIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InputMapUIResource__
diff --git a/libjava/javax/swing/plaf/InsetsUIResource.h b/libjava/javax/swing/plaf/InsetsUIResource.h
new file mode 100644
index 00000000000..f9621375d95
--- /dev/null
+++ b/libjava/javax/swing/plaf/InsetsUIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InsetsUIResource__
+#define __javax_swing_plaf_InsetsUIResource__
+
+#pragma interface
+
+#include <java/awt/Insets.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InsetsUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InsetsUIResource : public ::java::awt::Insets
+{
+
+public:
+  InsetsUIResource(jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = 5622110143266315421LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InsetsUIResource__
diff --git a/libjava/javax/swing/plaf/InternalFrameUI.h b/libjava/javax/swing/plaf/InternalFrameUI.h
new file mode 100644
index 00000000000..1aa4f76afd9
--- /dev/null
+++ b/libjava/javax/swing/plaf/InternalFrameUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InternalFrameUI__
+#define __javax_swing_plaf_InternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InternalFrameUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InternalFrameUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  InternalFrameUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InternalFrameUI__
diff --git a/libjava/javax/swing/plaf/LabelUI.h b/libjava/javax/swing/plaf/LabelUI.h
new file mode 100644
index 00000000000..018087af033
--- /dev/null
+++ b/libjava/javax/swing/plaf/LabelUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_LabelUI__
+#define __javax_swing_plaf_LabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class LabelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::LabelUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  LabelUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_LabelUI__
diff --git a/libjava/javax/swing/plaf/ListUI.h b/libjava/javax/swing/plaf/ListUI.h
new file mode 100644
index 00000000000..241768f021b
--- /dev/null
+++ b/libjava/javax/swing/plaf/ListUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ListUI__
+#define __javax_swing_plaf_ListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+          class ListUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ListUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ListUI();
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *) = 0;
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint) = 0;
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ListUI__
diff --git a/libjava/javax/swing/plaf/MenuBarUI.h b/libjava/javax/swing/plaf/MenuBarUI.h
new file mode 100644
index 00000000000..cf2aba65494
--- /dev/null
+++ b/libjava/javax/swing/plaf/MenuBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_MenuBarUI__
+#define __javax_swing_plaf_MenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class MenuBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::MenuBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  MenuBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_MenuBarUI__
diff --git a/libjava/javax/swing/plaf/MenuItemUI.h b/libjava/javax/swing/plaf/MenuItemUI.h
new file mode 100644
index 00000000000..9f4692bd89f
--- /dev/null
+++ b/libjava/javax/swing/plaf/MenuItemUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_MenuItemUI__
+#define __javax_swing_plaf_MenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class MenuItemUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::MenuItemUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  MenuItemUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_MenuItemUI__
diff --git a/libjava/javax/swing/plaf/OptionPaneUI.h b/libjava/javax/swing/plaf/OptionPaneUI.h
new file mode 100644
index 00000000000..1dbd6b8c896
--- /dev/null
+++ b/libjava/javax/swing/plaf/OptionPaneUI.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_OptionPaneUI__
+#define __javax_swing_plaf_OptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JOptionPane;
+      namespace plaf
+      {
+          class OptionPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::OptionPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  OptionPaneUI();
+  virtual void selectInitialValue(::javax::swing::JOptionPane *) = 0;
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_OptionPaneUI__
diff --git a/libjava/javax/swing/plaf/PanelUI.h b/libjava/javax/swing/plaf/PanelUI.h
new file mode 100644
index 00000000000..9b962235b9f
--- /dev/null
+++ b/libjava/javax/swing/plaf/PanelUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_PanelUI__
+#define __javax_swing_plaf_PanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class PanelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::PanelUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  PanelUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_PanelUI__
diff --git a/libjava/javax/swing/plaf/PopupMenuUI.h b/libjava/javax/swing/plaf/PopupMenuUI.h
new file mode 100644
index 00000000000..16aa6b5a1d7
--- /dev/null
+++ b/libjava/javax/swing/plaf/PopupMenuUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_PopupMenuUI__
+#define __javax_swing_plaf_PopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class Popup;
+      namespace plaf
+      {
+          class PopupMenuUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::PopupMenuUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  PopupMenuUI();
+  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
+  virtual ::javax::swing::Popup * getPopup(::javax::swing::JPopupMenu *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_PopupMenuUI__
diff --git a/libjava/javax/swing/plaf/ProgressBarUI.h b/libjava/javax/swing/plaf/ProgressBarUI.h
new file mode 100644
index 00000000000..d9e6714acc8
--- /dev/null
+++ b/libjava/javax/swing/plaf/ProgressBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ProgressBarUI__
+#define __javax_swing_plaf_ProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ProgressBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ProgressBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ProgressBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ProgressBarUI__
diff --git a/libjava/javax/swing/plaf/RootPaneUI.h b/libjava/javax/swing/plaf/RootPaneUI.h
new file mode 100644
index 00000000000..3e82895d7c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/RootPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_RootPaneUI__
+#define __javax_swing_plaf_RootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class RootPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::RootPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  RootPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_RootPaneUI__
diff --git a/libjava/javax/swing/plaf/ScrollBarUI.h b/libjava/javax/swing/plaf/ScrollBarUI.h
new file mode 100644
index 00000000000..24854eff2aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/ScrollBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ScrollBarUI__
+#define __javax_swing_plaf_ScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ScrollBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ScrollBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ScrollBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ScrollBarUI__
diff --git a/libjava/javax/swing/plaf/ScrollPaneUI.h b/libjava/javax/swing/plaf/ScrollPaneUI.h
new file mode 100644
index 00000000000..7253175358d
--- /dev/null
+++ b/libjava/javax/swing/plaf/ScrollPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ScrollPaneUI__
+#define __javax_swing_plaf_ScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ScrollPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ScrollPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ScrollPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/SeparatorUI.h b/libjava/javax/swing/plaf/SeparatorUI.h
new file mode 100644
index 00000000000..c968d73cc55
--- /dev/null
+++ b/libjava/javax/swing/plaf/SeparatorUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SeparatorUI__
+#define __javax_swing_plaf_SeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SeparatorUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SeparatorUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SeparatorUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SeparatorUI__
diff --git a/libjava/javax/swing/plaf/SliderUI.h b/libjava/javax/swing/plaf/SliderUI.h
new file mode 100644
index 00000000000..bc18a5f739f
--- /dev/null
+++ b/libjava/javax/swing/plaf/SliderUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SliderUI__
+#define __javax_swing_plaf_SliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SliderUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SliderUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SliderUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SliderUI__
diff --git a/libjava/javax/swing/plaf/SpinnerUI.h b/libjava/javax/swing/plaf/SpinnerUI.h
new file mode 100644
index 00000000000..c20f12d9216
--- /dev/null
+++ b/libjava/javax/swing/plaf/SpinnerUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SpinnerUI__
+#define __javax_swing_plaf_SpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SpinnerUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SpinnerUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SpinnerUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SpinnerUI__
diff --git a/libjava/javax/swing/plaf/SplitPaneUI.h b/libjava/javax/swing/plaf/SplitPaneUI.h
new file mode 100644
index 00000000000..31c1ec1699c
--- /dev/null
+++ b/libjava/javax/swing/plaf/SplitPaneUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SplitPaneUI__
+#define __javax_swing_plaf_SplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSplitPane;
+      namespace plaf
+      {
+          class SplitPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SplitPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SplitPaneUI();
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *) = 0;
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint) = 0;
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SplitPaneUI__
diff --git a/libjava/javax/swing/plaf/TabbedPaneUI.h b/libjava/javax/swing/plaf/TabbedPaneUI.h
new file mode 100644
index 00000000000..725554a386e
--- /dev/null
+++ b/libjava/javax/swing/plaf/TabbedPaneUI.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TabbedPaneUI__
+#define __javax_swing_plaf_TabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTabbedPane;
+      namespace plaf
+      {
+          class TabbedPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TabbedPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TabbedPaneUI();
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint) = 0;
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint) = 0;
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/TableHeaderUI.h b/libjava/javax/swing/plaf/TableHeaderUI.h
new file mode 100644
index 00000000000..cc0c5c8f383
--- /dev/null
+++ b/libjava/javax/swing/plaf/TableHeaderUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TableHeaderUI__
+#define __javax_swing_plaf_TableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TableHeaderUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TableHeaderUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TableHeaderUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TableHeaderUI__
diff --git a/libjava/javax/swing/plaf/TableUI.h b/libjava/javax/swing/plaf/TableUI.h
new file mode 100644
index 00000000000..5e8c51d777b
--- /dev/null
+++ b/libjava/javax/swing/plaf/TableUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TableUI__
+#define __javax_swing_plaf_TableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TableUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TableUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TableUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TableUI__
diff --git a/libjava/javax/swing/plaf/TextUI.h b/libjava/javax/swing/plaf/TextUI.h
new file mode 100644
index 00000000000..1c4faf66d82
--- /dev/null
+++ b/libjava/javax/swing/plaf/TextUI.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TextUI__
+#define __javax_swing_plaf_TextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TextUI;
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TextUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TextUI();
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint) = 0;
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *) = 0;
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *) = 0;
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint) = 0;
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *) = 0;
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::java::lang::String * getToolTipText(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TextUI__
diff --git a/libjava/javax/swing/plaf/ToolBarUI.h b/libjava/javax/swing/plaf/ToolBarUI.h
new file mode 100644
index 00000000000..79600b2a9fd
--- /dev/null
+++ b/libjava/javax/swing/plaf/ToolBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ToolBarUI__
+#define __javax_swing_plaf_ToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ToolBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ToolBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ToolBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ToolBarUI__
diff --git a/libjava/javax/swing/plaf/ToolTipUI.h b/libjava/javax/swing/plaf/ToolTipUI.h
new file mode 100644
index 00000000000..2c061abb8b3
--- /dev/null
+++ b/libjava/javax/swing/plaf/ToolTipUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ToolTipUI__
+#define __javax_swing_plaf_ToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ToolTipUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ToolTipUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ToolTipUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ToolTipUI__
diff --git a/libjava/javax/swing/plaf/TreeUI.h b/libjava/javax/swing/plaf/TreeUI.h
new file mode 100644
index 00000000000..69bbc1215d8
--- /dev/null
+++ b/libjava/javax/swing/plaf/TreeUI.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TreeUI__
+#define __javax_swing_plaf_TreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+      namespace plaf
+      {
+          class TreeUI;
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TreeUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TreeUI();
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint) = 0;
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual jint getRowCount(::javax::swing::JTree *) = 0;
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint) = 0;
+  virtual jboolean isEditing(::javax::swing::JTree *) = 0;
+  virtual jboolean stopEditing(::javax::swing::JTree *) = 0;
+  virtual void cancelEditing(::javax::swing::JTree *) = 0;
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TreeUI__
diff --git a/libjava/javax/swing/plaf/UIResource.h b/libjava/javax/swing/plaf/UIResource.h
new file mode 100644
index 00000000000..0ddd789264d
--- /dev/null
+++ b/libjava/javax/swing/plaf/UIResource.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_UIResource__
+#define __javax_swing_plaf_UIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class UIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::UIResource : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_UIResource__
diff --git a/libjava/javax/swing/plaf/ViewportUI.h b/libjava/javax/swing/plaf/ViewportUI.h
new file mode 100644
index 00000000000..64855b17a9a
--- /dev/null
+++ b/libjava/javax/swing/plaf/ViewportUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ViewportUI__
+#define __javax_swing_plaf_ViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ViewportUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ViewportUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ViewportUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.h b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
new file mode 100644
index 00000000000..033f499aaf8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicArrowButton__
+#define __javax_swing_plaf_basic_BasicArrowButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicArrowButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicArrowButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicArrowButton(jint);
+  BasicArrowButton(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual jboolean isFocusTraversable();
+  virtual jint getDirection();
+  virtual void setDirection(jint);
+  virtual void paint(::java::awt::Graphics *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual void paintTriangle(::java::awt::Graphics *, jint, jint, jint, jint, jboolean);
+private:
+  void paintTriangleNorth(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleSouth(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleEast(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleWest(::java::awt::Graphics *, jint, jint, jint, jboolean);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) direction;
+public: // actually package-private
+  ::java::awt::Color * shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicArrowButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
new file mode 100644
index 00000000000..b4a2c915729
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$ButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$ButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -157053874580739687LL;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
new file mode 100644
index 00000000000..455b711c0ce
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$FieldBorder__
+#define __javax_swing_plaf_basic_BasicBorders$FieldBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$FieldBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$FieldBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$FieldBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = 949220756998454908LL;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$FieldBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
new file mode 100644
index 00000000000..a974a460a8d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$MarginBorder__
+#define __javax_swing_plaf_basic_BasicBorders$MarginBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$MarginBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$MarginBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -3035848353448896090LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$MarginBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
new file mode 100644
index 00000000000..fcf26ba5918
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
+#define __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MenuBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$MenuBarBorder(::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -6909056571935227506LL;
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
new file mode 100644
index 00000000000..b737890ede1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$RadioButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$RadioButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$RadioButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = 1596945751743747369LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
new file mode 100644
index 00000000000..84d6ee07631
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$RolloverButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$RolloverButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$RolloverButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = 1976364864896996846LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
new file mode 100644
index 00000000000..3a7d22f30aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
+#define __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$SplitPaneBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$SplitPaneBorder : public ::java::lang::Object
+{
+
+public:
+  BasicBorders$SplitPaneBorder(::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void paintRect(::java::awt::Graphics *, jint, jboolean, jint, jint, ::java::awt::Rectangle *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  static const jint SUPPRESS_TOP = 1;
+  static const jint SUPPRESS_LEFT = 2;
+  static const jint SUPPRESS_BOTTOM = 4;
+  static const jint SUPPRESS_RIGHT = 8;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) highlight;
+  ::java::awt::Color * shadow;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
new file mode 100644
index 00000000000..90a89464be5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
+#define __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSplitPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$SplitPaneDividerBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$SplitPaneDividerBorder : public ::java::lang::Object
+{
+
+public:
+  BasicBorders$SplitPaneDividerBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  ::javax::swing::JSplitPane * getSplitPane(::java::awt::Component *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
new file mode 100644
index 00000000000..73d1f1c4e67
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$ToggleButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$ToggleButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$ToggleButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -3528666548001058394LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.h b/libjava/javax/swing/plaf/basic/BasicBorders.h
new file mode 100644
index 00000000000..e32e2b266c3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders__
+#define __javax_swing_plaf_basic_BasicBorders__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders;
+            class BasicBorders$MarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders : public ::java::lang::Object
+{
+
+public:
+  BasicBorders();
+  static ::javax::swing::border::Border * getButtonBorder();
+  static ::javax::swing::border::Border * getRadioButtonBorder();
+  static ::javax::swing::border::Border * getToggleButtonBorder();
+  static ::javax::swing::border::Border * getMenuBarBorder();
+  static ::javax::swing::border::Border * getSplitPaneBorder();
+  static ::javax::swing::border::Border * getSplitPaneDividerBorder();
+  static ::javax::swing::border::Border * getTextFieldBorder();
+  static ::javax::swing::border::Border * getProgressBarBorder();
+  static ::javax::swing::border::Border * getInternalFrameBorder();
+public: // actually package-private
+  static ::javax::swing::border::Border * getMarginBorder();
+private:
+  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * sharedMarginBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
new file mode 100644
index 00000000000..ae787f71f62
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$1__
+#define __javax_swing_plaf_basic_BasicButtonListener$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicButtonListener$1(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
new file mode 100644
index 00000000000..9605bfcccdc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$2__
+#define __javax_swing_plaf_basic_BasicButtonListener$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicButtonListener$2(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
new file mode 100644
index 00000000000..6e08aa431f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
+#define __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$ButtonAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$ButtonAction : public ::javax::swing::AbstractAction
+{
+
+  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled(::java::lang::Object *);
+public: // actually package-private
+  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *, ::javax::swing::plaf::basic::BasicButtonListener$ButtonAction *);
+  static ::java::lang::String * PRESSED;
+  static ::java::lang::String * RELEASED;
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.h b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
new file mode 100644
index 00000000000..8b7cd51d2eb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener__
+#define __javax_swing_plaf_basic_BasicButtonListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class ActionMap;
+        class JComponent;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener : public ::java::lang::Object
+{
+
+public:
+  BasicButtonListener(::javax::swing::AbstractButton *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually protected
+  virtual void checkOpacity(::javax::swing::AbstractButton *);
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+  virtual void installKeyboardActions(::javax::swing::JComponent *);
+private:
+  ::javax::swing::ActionMap * createDefaultActionMap();
+public:
+  virtual void uninstallKeyboardActions(::javax::swing::JComponent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.h b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
new file mode 100644
index 00000000000..c7209c0a312
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonUI__
+#define __javax_swing_plaf_basic_BasicButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class Icon;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  BasicButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual jint getDefaultTextIconGap(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void clearTextShiftOffset();
+  virtual jint getTextShiftOffset();
+  virtual void setTextShiftOffset();
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+  virtual ::javax::swing::plaf::basic::BasicButtonListener * createButtonListener(::javax::swing::AbstractButton *);
+  virtual void installListeners(::javax::swing::AbstractButton *);
+  virtual void uninstallListeners(::javax::swing::AbstractButton *);
+  virtual void installKeyboardActions(::javax::swing::AbstractButton *);
+  virtual void uninstallKeyboardActions(::javax::swing::AbstractButton *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually package-private
+  static ::javax::swing::Icon * currentIcon(::javax::swing::AbstractButton *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::lang::String *);
+private:
+  ::javax::swing::plaf::basic::BasicButtonListener * getButtonListener(::javax::swing::AbstractButton *);
+public: // actually package-private
+  static ::java::awt::Rectangle * viewR;
+  static ::java::awt::Rectangle * iconR;
+  static ::java::awt::Rectangle * textR;
+  static ::java::awt::Insets * cachedInsets;
+private:
+  static ::javax::swing::plaf::basic::BasicButtonUI * sharedUI;
+  static ::javax::swing::plaf::basic::BasicButtonListener * sharedListener;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) defaultTextIconGap;
+  jint defaultTextShiftOffset;
+private:
+  jint textShiftOffset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
new file mode 100644
index 00000000000..68f69f589a7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
+#define __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicCheckBoxMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicCheckBoxMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicCheckBoxMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
new file mode 100644
index 00000000000..ca6b44b3c9f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicCheckBoxUI__
+#define __javax_swing_plaf_basic_BasicCheckBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicCheckBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicCheckBoxUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
+{
+
+public:
+  BasicCheckBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getPropertyPrefix();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
new file mode 100644
index 00000000000..b5b58f51b5c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$1__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicColorChooserUI$1(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
new file mode 100644
index 00000000000..a7c3a279a08
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$PreviewListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener : public ::java::lang::Object
+{
+
+  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener *);
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
new file mode 100644
index 00000000000..ed5743feb8d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$PropertyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$PropertyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicColorChooserUI$PropertyHandler(::javax::swing::plaf::basic::BasicColorChooserUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
new file mode 100644
index 00000000000..3ca157fe9d9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$TabPaneListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener : public ::java::lang::Object
+{
+
+  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener *);
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
new file mode 100644
index 00000000000..83a41b05d81
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI__
+#define __javax_swing_plaf_basic_BasicColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ColorChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JColorChooser;
+        class JComponent;
+        class JTabbedPane;
+      namespace colorchooser
+      {
+          class AbstractColorChooserPanel;
+      }
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicColorChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
+{
+
+public:
+  BasicColorChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * createDefaultChoosers();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void makeTabs(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaultChoosers();
+  virtual void installPreviewPanel();
+public: // actually package-private
+  virtual void updatePreviewPanel(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void uninstallListeners();
+  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) defaultChoosers;
+  ::javax::swing::event::ChangeListener * previewListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JColorChooser * chooser;
+public: // actually package-private
+  ::javax::swing::JTabbedPane * pane;
+private:
+  ::java::awt::Container * prevContainer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
new file mode 100644
index 00000000000..36a4682b0ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
+#define __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxEditor$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxEditor$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxEditor
+{
+
+public:
+  BasicComboBoxEditor$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
new file mode 100644
index 00000000000..5bde099f2ba
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor__
+#define __javax_swing_plaf_basic_BasicComboBoxEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class ActionListener;
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTextField;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxEditor;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxEditor : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxEditor();
+  virtual ::java::awt::Component * getEditorComponent();
+  virtual void setItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getItem();
+  virtual void selectAll();
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+public: // actually protected
+  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
new file mode 100644
index 00000000000..76eaa5c09f7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
+#define __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxRenderer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxRenderer$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxRenderer$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxRenderer
+{
+
+public:
+  BasicComboBoxRenderer$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
new file mode 100644
index 00000000000..746cf3ce132
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer__
+#define __javax_swing_plaf_basic_BasicComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxRenderer : public ::javax::swing::JLabel
+{
+
+public:
+  BasicComboBoxRenderer();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually protected
+  static ::javax::swing::border::Border * noFocusBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
new file mode 100644
index 00000000000..e907fe231e4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ComboBoxLayoutManager(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
new file mode 100644
index 00000000000..e5f84c171c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$FocusHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
new file mode 100644
index 00000000000..e07a4649409
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ItemHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ItemHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
new file mode 100644
index 00000000000..b2657b802cb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$KeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicComboBoxUI$KeyHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
new file mode 100644
index 00000000000..8647c7fd412
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ListDataHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..987d5406e2b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
new file mode 100644
index 00000000000..77f1f53d41c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
@@ -0,0 +1,154 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI__
+#define __javax_swing_plaf_basic_BasicComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComboBoxUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class LayoutManager;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class ItemListener;
+          class KeyListener;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class CellRendererPane;
+        class ComboBoxEditor;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JList;
+        class ListCellRenderer;
+      namespace event
+      {
+          class ListDataListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class ComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
+{
+
+public:
+  BasicComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::java::awt::event::ItemListener * createItemListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::javax::swing::ListCellRenderer * createRenderer();
+  virtual ::javax::swing::ComboBoxEditor * createEditor();
+  virtual void installComponents();
+  virtual void uninstallComponents();
+public:
+  virtual void addEditor();
+  virtual void removeEditor();
+public: // actually protected
+  virtual void configureEditor();
+  virtual void unconfigureEditor();
+public:
+  virtual void configureArrowButton();
+  virtual void unconfigureArrowButton();
+public: // actually protected
+  virtual ::javax::swing::JButton * createArrowButton();
+public:
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  virtual jboolean isNavigationKey(jint);
+  virtual void selectNextPossibleValue();
+  virtual void selectPreviousPossibleValue();
+  virtual void toggleOpenClose();
+  virtual ::java::awt::Rectangle * rectangleForCurrentValue();
+  virtual ::java::awt::Insets * getInsets();
+public:
+  virtual void paintCurrentValue(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintCurrentValueBackground(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
+public: // actually protected
+  virtual ::java::awt::Dimension * getDefaultSize();
+  virtual ::java::awt::Dimension * getDisplaySize();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) arrowButton;
+  ::javax::swing::JComboBox * comboBox;
+  ::java::awt::Component * editor;
+  ::java::awt::event::FocusListener * focusListener;
+  jboolean hasFocus;
+  ::java::awt::event::ItemListener * itemListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::JList * listBox;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::javax::swing::plaf::basic::ComboPopup * popup;
+  ::java::awt::event::KeyListener * popupKeyListener;
+  ::java::awt::event::MouseListener * popupMouseListener;
+  ::java::awt::event::MouseMotionListener * popupMouseMotionListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually package-private
+  ::java::awt::Dimension * displaySize;
+public: // actually protected
+  ::javax::swing::CellRendererPane * currentValuePane;
+  ::java::awt::Dimension * cachedMinimumSize;
+  jboolean isMinimumSizeDirty;
+private:
+  static ::javax::swing::ListCellRenderer * DEFAULT_RENDERER;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
new file mode 100644
index 00000000000..ecf7e1b8ef1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationKeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicComboPopup$InvocationKeyHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
new file mode 100644
index 00000000000..b04fb475d3a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$InvocationMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
new file mode 100644
index 00000000000..b8c7bae477e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseMotionAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationMouseMotionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$InvocationMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
new file mode 100644
index 00000000000..017c66bce0c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ItemHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$ItemHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
new file mode 100644
index 00000000000..d7924a453bc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboPopup$ListDataHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
new file mode 100644
index 00000000000..84b748854d3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListMouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$ListMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
new file mode 100644
index 00000000000..d772569baf4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseMotionAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListMouseMotionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$ListMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
new file mode 100644
index 00000000000..dd3caad107f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListSelectionHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$ListSelectionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
new file mode 100644
index 00000000000..5bff9aa4c19
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
new file mode 100644
index 00000000000..4c878caa61c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
@@ -0,0 +1,135 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup__
+#define __javax_swing_plaf_basic_BasicComboPopup__
+
+#pragma interface
+
+#include <javax/swing/JPopupMenu.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class ItemListener;
+          class KeyListener;
+          class MouseEvent;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxModel;
+        class JComboBox;
+        class JList;
+        class JScrollPane;
+        class Timer;
+      namespace event
+      {
+          class ListDataListener;
+          class ListSelectionListener;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup : public ::javax::swing::JPopupMenu
+{
+
+public:
+  BasicComboPopup(::javax::swing::JComboBox *);
+  virtual void show();
+  virtual void hide();
+  virtual ::javax::swing::JList * getList();
+  virtual ::java::awt::event::MouseListener * getMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener();
+  virtual ::java::awt::event::KeyListener * getKeyListener();
+  virtual void uninstallingUI();
+public: // actually protected
+  virtual void uninstallComboBoxModelListeners(::javax::swing::ComboBoxModel *);
+  virtual void uninstallKeyboardActions();
+  virtual void firePopupMenuWillBecomeVisible();
+  virtual void firePopupMenuWillBecomeInvisible();
+  virtual void firePopupMenuCanceled();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * createMouseMotionListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::java::awt::event::MouseListener * createListMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * createListMouseMotionListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::ItemListener * createItemListener();
+  virtual ::javax::swing::JList * createList();
+  virtual void configureList();
+  virtual void installListListeners();
+  virtual ::javax::swing::JScrollPane * createScroller();
+  virtual void configureScroller();
+  virtual void configurePopup();
+  virtual void installComboBoxListeners();
+  virtual void installComboBoxModelListeners(::javax::swing::ComboBoxModel *);
+  virtual void installKeyboardActions();
+public:
+  virtual jboolean isFocusTraversable();
+public: // actually protected
+  virtual void startAutoScrolling(jint);
+  virtual void stopAutoScrolling();
+  virtual void autoScrollUp();
+  virtual void autoScrollDown();
+  virtual void delegateFocus(::java::awt::event::MouseEvent *);
+  virtual void togglePopup();
+  virtual ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::event::MouseEvent *);
+  virtual jint getPopupHeightForRowCount(jint);
+  virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
+  virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
+private:
+  void uninstallListeners();
+  void uninstallListListeners();
+  void uninstallComboBoxListeners();
+public: // actually package-private
+  virtual void syncListSelection();
+public: // actually protected
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::javax::swing::JPopupMenu)))) autoscrollTimer;
+  ::javax::swing::JComboBox * comboBox;
+  jboolean hasEntered;
+  jboolean isAutoScrolling;
+  ::java::awt::event::ItemListener * itemListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::JList * list;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::java::awt::event::MouseListener * listMouseListener;
+  ::java::awt::event::MouseMotionListener * listMouseMotionListener;
+  ::javax::swing::event::ListSelectionListener * listSelectionListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::awt::event::MouseMotionListener * mouseMotionListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  static const jint SCROLL_DOWN = 1;
+  static const jint SCROLL_UP = 0;
+  jint scrollDirection;
+  ::javax::swing::JScrollPane * scroller;
+  jboolean valueIsAdjusting;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
new file mode 100644
index 00000000000..1f42bbcd33b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$1__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$1(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
new file mode 100644
index 00000000000..97ffeb9dee3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$2__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$2(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
new file mode 100644
index 00000000000..7a67871449f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$BoundButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicDesktopIconUI$BoundButton(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::java::lang::String *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
new file mode 100644
index 00000000000..cfce73806cf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$DesktopIconBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder : public ::java::lang::Object
+{
+
+  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
+  jint top;
+  jint right;
+  jint bottom;
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
new file mode 100644
index 00000000000..4a53e9a62c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI$InternalFrameDefaultMenuIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$InternalFrameDefaultMenuIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$InternalFrameDefaultMenuIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
new file mode 100644
index 00000000000..0829e1ff9b4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JDesktopPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$MouseInputHandler : public ::javax::swing::event::MouseInputAdapter
+{
+
+public:
+  BasicDesktopIconUI$MouseInputHandler(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void moveAndRepaint(::javax::swing::JComponent *, jint, jint, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) xOffset;
+  jint yOffset;
+  ::javax::swing::JDesktopPane * pane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
new file mode 100644
index 00000000000..bafff1a0692
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopIconUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JInternalFrame;
+        class JInternalFrame$JDesktopIcon;
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$BoundButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
+{
+
+public:
+  BasicDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents();
+  virtual void uninstallComponents();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
+  virtual void deiconize();
+private:
+  static const jint iconSize = 16;
+  static const jint iconWidth = 160;
+  static const jint iconHeight = 35;
+public: // actually protected
+  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) desktopIcon;
+  ::javax::swing::JInternalFrame * frame;
+private:
+  ::javax::swing::event::MouseInputListener * mouseHandler;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton * button;
+private:
+  ::java::beans::PropertyChangeListener * propertyHandler;
+public: // actually package-private
+  static ::javax::swing::Icon * defaultIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
new file mode 100644
index 00000000000..da7e843ab7c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$CloseAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
new file mode 100644
index 00000000000..2733cec79fa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$MaximizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
new file mode 100644
index 00000000000..c834c71de9c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$MinimizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$MinimizeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$MinimizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
new file mode 100644
index 00000000000..b327f1cb3d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$NavigateAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
new file mode 100644
index 00000000000..0fc733b6f15
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$OpenAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$OpenAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$OpenAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
new file mode 100644
index 00000000000..c67ca088d26
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DesktopManager;
+        class JComponent;
+        class JDesktopPane;
+        class KeyStroke;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
+{
+
+public:
+  BasicDesktopPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installDesktopManager();
+  virtual void installKeyboardActions();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void registerKeyboardActions();
+  virtual void uninstallDefaults();
+  virtual void uninstallDesktopManager();
+  virtual void uninstallKeyboardActions();
+  virtual void unregisterKeyboardActions();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) closeKey;
+  ::javax::swing::KeyStroke * maximizeKey;
+  ::javax::swing::KeyStroke * minimizeKey;
+  ::javax::swing::KeyStroke * navigateKey;
+  ::javax::swing::KeyStroke * navigateKey2;
+  ::javax::swing::DesktopManager * desktopManager;
+  ::javax::swing::JDesktopPane * desktop;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
new file mode 100644
index 00000000000..4d14a6f25a2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$1__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDirectoryModel$1(::javax::swing::plaf::basic::BasicDirectoryModel *);
+public:
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
new file mode 100644
index 00000000000..a5d2a719d3c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel$DirectoryLoadThread;
+            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *, ::java::util::List *, jint, ::java::util::List *, jint);
+public:
+  virtual void run();
+public: // actually package-private
+  virtual void cancel();
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) added;
+  jint addIndex;
+  ::java::util::List * removed;
+  jint removeIndex;
+  jboolean cancel__;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
new file mode 100644
index 00000000000..d20f830c24a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
+
+#pragma interface
+
+#include <java/lang/Thread.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$DirectoryLoadThread;
+            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread : public ::java::lang::Thread
+{
+
+public: // actually package-private
+  BasicDirectoryModel$DirectoryLoadThread(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::io::File *);
+public:
+  virtual void run();
+private:
+  void invokeLater(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest *);
+public: // actually package-private
+  virtual void cancelPending();
+  static ::javax::swing::plaf::basic::BasicDirectoryModel * access$0(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *);
+  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) directory;
+private:
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest * pending;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDirectoryModel * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
new file mode 100644
index 00000000000..f13550f7100
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel__
+#define __javax_swing_plaf_basic_BasicDirectoryModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$DirectoryLoadThread;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  BasicDirectoryModel(::javax::swing::JFileChooser *);
+  virtual jboolean contains(::java::lang::Object *);
+  virtual void fireContentsChanged();
+  virtual ::java::util::Vector * getDirectories();
+  virtual ::java::lang::Object * getElementAt(jint);
+  virtual ::java::util::Vector * getFiles();
+  virtual jint getSize();
+  virtual jint indexOf(::java::lang::Object *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+  virtual void invalidateFileCache();
+public: // actually protected
+  virtual jboolean lt(::java::io::File *, ::java::io::File *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual jboolean renameFile(::java::io::File *, ::java::io::File *);
+public: // actually protected
+  virtual void sort(::java::util::Vector *);
+public:
+  virtual void validateFileCache();
+public: // actually package-private
+  static ::java::util::Vector * access$0(::javax::swing::plaf::basic::BasicDirectoryModel *);
+  static void access$1(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
+  static void access$2(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
+  static void access$3(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
+  static void access$4(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
+  static ::javax::swing::JFileChooser * access$5(::javax::swing::plaf::basic::BasicDirectoryModel *);
+private:
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) contents;
+  ::java::util::Vector * directories;
+  ::java::util::Vector * files;
+  jint listingMode;
+  ::javax::swing::JFileChooser * filechooser;
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * loadThread;
+  ::java::util::Comparator * comparator;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel__
diff --git a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
new file mode 100644
index 00000000000..b0033edb185
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicEditorPaneUI__
+#define __javax_swing_plaf_basic_BasicEditorPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicEditorPaneUI;
+        }
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicEditorPaneUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicEditorPaneUI();
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicEditorPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
new file mode 100644
index 00000000000..72434cc649f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
+
+#pragma interface
+
+#include <javax/swing/filechooser/FileFilter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$AcceptAllFileFilter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$AcceptAllFileFilter : public ::javax::swing::filechooser::FileFilter
+{
+
+public:
+  BasicFileChooserUI$AcceptAllFileFilter(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  virtual jboolean accept(::java::io::File *);
+  virtual ::java::lang::String * getDescription();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileFilter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
new file mode 100644
index 00000000000..b650369befd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ApproveSelectionAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$ApproveSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
new file mode 100644
index 00000000000..dece5a2e955
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
+
+#pragma interface
+
+#include <javax/swing/filechooser/FileView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$BasicFileView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$BasicFileView : public ::javax::swing::filechooser::FileView
+{
+
+public:
+  BasicFileChooserUI$BasicFileView(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  virtual void cacheIcon(::java::io::File *, ::javax::swing::Icon *);
+  virtual void clearIconCache();
+  virtual ::javax::swing::Icon * getCachedIcon(::java::io::File *);
+  virtual ::java::lang::String * getDescription(::java::io::File *);
+  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
+  virtual ::java::lang::String * getName(::java::io::File *);
+  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
+  virtual ::java::lang::Boolean * isHidden(::java::io::File *);
+public: // actually protected
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileView)))) iconCache;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
new file mode 100644
index 00000000000..03af702d390
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$CancelSelectionAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$CancelSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
new file mode 100644
index 00000000000..75b99b56b03
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ChangeToParentDirectoryAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$ChangeToParentDirectoryAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
new file mode 100644
index 00000000000..79df9920515
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$DoubleClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$DoubleClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicFileChooserUI$DoubleClickListener(::javax::swing::plaf::basic::BasicFileChooserUI *, ::javax::swing::JList *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastSelected;
+  ::javax::swing::JList * list;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
new file mode 100644
index 00000000000..219143eb5fb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$GoHomeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$GoHomeAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
new file mode 100644
index 00000000000..da249e43aae
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$NewFolderAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$NewFolderAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
new file mode 100644
index 00000000000..af8c2d0ba6e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$SelectionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$SelectionListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicFileChooserUI$SelectionListener(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
new file mode 100644
index 00000000000..a3db6b1345b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$UpdateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$UpdateAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
new file mode 100644
index 00000000000..8565a6757b1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
@@ -0,0 +1,187 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI__
+#define __javax_swing_plaf_basic_BasicFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/FileChooserUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JComponent;
+        class JFileChooser;
+        class JList;
+        class JPanel;
+        class JTextField;
+      namespace event
+      {
+          class ListSelectionListener;
+      }
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ApproveSelectionAction;
+            class BasicFileChooserUI$CancelSelectionAction;
+            class BasicFileChooserUI$ChangeToParentDirectoryAction;
+            class BasicFileChooserUI$GoHomeAction;
+            class BasicFileChooserUI$NewFolderAction;
+            class BasicFileChooserUI$UpdateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI : public ::javax::swing::plaf::FileChooserUI
+{
+
+public: // actually package-private
+  virtual void closeDialog();
+public:
+  BasicFileChooserUI(::javax::swing::JFileChooser *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void boxEntries();
+public:
+  virtual void installComponents(::javax::swing::JFileChooser *);
+  virtual void uninstallComponents(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual void installListeners(::javax::swing::JFileChooser *);
+  virtual void uninstallListeners(::javax::swing::JFileChooser *);
+  virtual void installDefaults(::javax::swing::JFileChooser *);
+  virtual void uninstallDefaults(::javax::swing::JFileChooser *);
+  virtual void installIcons(::javax::swing::JFileChooser *);
+  virtual void uninstallIcons(::javax::swing::JFileChooser *);
+  virtual void installStrings(::javax::swing::JFileChooser *);
+  virtual void uninstallStrings(::javax::swing::JFileChooser *);
+  virtual void createModel();
+public:
+  virtual ::javax::swing::plaf::basic::BasicDirectoryModel * getModel();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getFileName();
+  virtual ::java::lang::String * getDirectoryName();
+  virtual void setFileName(::java::lang::String *);
+  virtual void setDirectoryName(::java::lang::String *);
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
+  virtual ::javax::swing::JFileChooser * getFileChooser();
+  virtual ::javax::swing::JPanel * getAccessoryPanel();
+public: // actually protected
+  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
+public:
+  virtual ::java::lang::String * getApproveButtonToolTipText(::javax::swing::JFileChooser *);
+  virtual void clearIconCache();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::java::awt::event::MouseListener * createDoubleClickListener(::javax::swing::JFileChooser *, ::javax::swing::JList *);
+  virtual jboolean isDirectorySelected();
+  virtual void setDirectorySelected(jboolean);
+  virtual ::java::io::File * getDirectory();
+  virtual void setDirectory(::java::io::File *);
+public:
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
+  virtual jint getApproveButtonMnemonic(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::Action * getNewFolderAction();
+  virtual ::javax::swing::Action * getGoHomeAction();
+  virtual ::javax::swing::Action * getChangeToParentDirectoryAction();
+  virtual ::javax::swing::Action * getApproveSelectionAction();
+  virtual ::javax::swing::Action * getCancelSelectionAction();
+  virtual ::javax::swing::Action * getUpdateAction();
+public: // actually package-private
+  static ::java::io::File * access$0(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  static void access$1(::javax::swing::plaf::basic::BasicFileChooserUI *, ::java::io::File *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) cancelButtonMnemonic;
+  ::java::lang::String * cancelButtonText;
+  ::java::lang::String * cancelButtonToolTipText;
+  ::javax::swing::Icon * computerIcon;
+  ::javax::swing::Icon * detailsViewIcon;
+  ::javax::swing::Icon * directoryIcon;
+  jint directoryOpenButtonMnemonic;
+  ::java::lang::String * directoryOpenButtonText;
+  ::java::lang::String * directoryOpenButtonToolTipText;
+  ::javax::swing::Icon * fileIcon;
+  ::javax::swing::Icon * floppyDriveIcon;
+  ::javax::swing::Icon * hardDriveIcon;
+  jint helpButtonMnemonic;
+  ::java::lang::String * helpButtonText;
+  ::java::lang::String * helpButtonToolTipText;
+  ::javax::swing::Icon * homeFolderIcon;
+  ::javax::swing::Icon * listViewIcon;
+  ::javax::swing::Icon * newFolderIcon;
+  jint openButtonMnemonic;
+  ::java::lang::String * openButtonText;
+  ::java::lang::String * openButtonToolTipText;
+  jint saveButtonMnemonic;
+  ::java::lang::String * saveButtonText;
+  ::java::lang::String * saveButtonToolTipText;
+  jint updateButtonMnemonic;
+  ::java::lang::String * updateButtonText;
+  ::java::lang::String * updateButtonToolTipText;
+  ::javax::swing::Icon * upFolderIcon;
+public: // actually package-private
+  ::javax::swing::JFileChooser * filechooser;
+  ::javax::swing::plaf::basic::BasicDirectoryModel * model;
+  ::javax::swing::filechooser::FileFilter * acceptAll;
+  ::javax::swing::filechooser::FileView * fv;
+  ::javax::swing::JButton * accept;
+  ::javax::swing::JPanel * accessoryPanel;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::lang::String * acceptAllFileFilterText;
+  ::java::lang::String * dirDescText;
+  ::java::lang::String * fileDescText;
+  jboolean dirSelected;
+  ::java::io::File * currDir;
+  ::javax::swing::JPanel * bottomPanel;
+  ::javax::swing::JPanel * closePanel;
+  ::javax::swing::JTextField * entry;
+  ::java::lang::String * parentPath;
+private:
+  ::javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction * approveSelectionAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction * cancelSelectionAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction * goHomeAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction * changeToParentDirectoryAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction * newFolderAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction * updateAction;
+  ::java::io::File * selectedDir;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
new file mode 100644
index 00000000000..f024fbb63d9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
+#define __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicFormattedTextFieldUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFormattedTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  BasicFormattedTextFieldUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
new file mode 100644
index 00000000000..5cab989ac60
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicGraphicsUtils__
+#define __javax_swing_plaf_basic_BasicGraphicsUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicGraphicsUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicGraphicsUtils : public ::java::lang::Object
+{
+
+public:
+  BasicGraphicsUtils();
+  static void drawEtchedRect(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static ::java::awt::Insets * getEtchedInsets();
+  static void drawGroove(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static ::java::awt::Insets * getGrooveInsets();
+  static void drawBezel(::java::awt::Graphics *, jint, jint, jint, jint, jboolean, jboolean, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static void drawLoweredBezel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static void drawString(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  static void drawStringUnderlineCharAt(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+public: // actually package-private
+  static void drawString(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  static void drawStringUnderlineCharAt(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+public:
+  static void drawDashedRect(::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::awt::Dimension * getPreferredButtonSize(::javax::swing::AbstractButton *, jint);
+public: // actually package-private
+  static ::java::lang::String * CACHED_TEXT_LAYOUT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
new file mode 100644
index 00000000000..368ab871540
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
@@ -0,0 +1,87 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
+#define __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicHTML$HTMLRootView;
+        }
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class EditorKit;
+          class Element;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicHTML$HTMLRootView : public ::javax::swing::text::View
+{
+
+public:
+  BasicHTML$HTMLRootView(::javax::swing::JComponent *, ::javax::swing::text::View *, ::javax::swing::text::EditorKit *, ::javax::swing::text::Document *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual void setView(::javax::swing::text::View *);
+  virtual void setSize(jfloat, jfloat);
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual jint getViewCount();
+  virtual ::java::awt::Container * getContainer();
+  virtual jfloat getPreferredSpan(jint);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual ::javax::swing::text::Element * getElement();
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
+  ::javax::swing::JComponent * component;
+  ::javax::swing::text::EditorKit * editorKit;
+  ::javax::swing::text::Document * document;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML.h b/libjava/javax/swing/plaf/basic/BasicHTML.h
new file mode 100644
index 00000000000..7ae85956eca
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicHTML.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicHTML__
+#define __javax_swing_plaf_basic_BasicHTML__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicHTML;
+        }
+      }
+      namespace text
+      {
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicHTML : public ::java::lang::Object
+{
+
+public:
+  BasicHTML();
+  static ::javax::swing::text::View * createHTMLView(::javax::swing::JComponent *, ::java::lang::String *);
+  static jboolean isHTMLString(::java::lang::String *);
+  static void updateRenderer(::javax::swing::JComponent *, ::java::lang::String *);
+  static ::java::lang::String * propertyKey;
+  static ::java::lang::String * documentBaseKey;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicHTML__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
new file mode 100644
index 00000000000..5a75dbb60ca
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$1__
+#define __javax_swing_plaf_basic_BasicIconFactory$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$1();
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
new file mode 100644
index 00000000000..be87bf9d96a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$2__
+#define __javax_swing_plaf_basic_BasicIconFactory$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$2();
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
new file mode 100644
index 00000000000..0287f1c7acb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$CheckBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$CheckBoxIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
new file mode 100644
index 00000000000..9c1d7f0262e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$CheckBoxMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$CheckBoxMenuItemIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
new file mode 100644
index 00000000000..d7771903215
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$DummyIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$DummyIcon : public ::java::lang::Object
+{
+
+  BasicIconFactory$DummyIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  BasicIconFactory$DummyIcon(::javax::swing::plaf::basic::BasicIconFactory$DummyIcon *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
new file mode 100644
index 00000000000..a30f4d0d4a9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$RadioButtonIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory.h b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
new file mode 100644
index 00000000000..fc851373dda
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory__
+#define __javax_swing_plaf_basic_BasicIconFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory;
+            class BasicIconFactory$CheckBoxIcon;
+            class BasicIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory : public ::java::lang::Object
+{
+
+public:
+  BasicIconFactory();
+  static ::javax::swing::Icon * getMenuItemCheckIcon();
+  static ::javax::swing::Icon * getMenuItemArrowIcon();
+  static ::javax::swing::Icon * getMenuArrowIcon();
+  static ::javax::swing::Icon * getCheckBoxIcon();
+  static ::javax::swing::Icon * getRadioButtonIcon();
+  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
+  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
+  static ::javax::swing::Icon * createEmptyFrameIcon();
+public: // actually package-private
+  static const jlong serialVersionUID = 5605588811185324383LL;
+private:
+  static ::javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon * checkBoxIcon;
+  static ::javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon * radioButtonIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
new file mode 100644
index 00000000000..efce70e9db2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$CloseAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
new file mode 100644
index 00000000000..4ed9a7f741f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$IconifyAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$IconifyAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$IconifyAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
new file mode 100644
index 00000000000..cf31b3c0d10
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$MaximizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
new file mode 100644
index 00000000000..6c4570f1f9c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$MoveAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MoveAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$MoveAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
new file mode 100644
index 00000000000..3177afec5c7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$PaneButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PaneButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicInternalFrameTitlePane$PaneButton(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *, ::javax::swing::Action *);
+  virtual jboolean isFocusable();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
new file mode 100644
index 00000000000..be7bb8be66f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameTitlePane$PropertyChangeHandler(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
new file mode 100644
index 00000000000..b33c5e0cda1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$RestoreAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$RestoreAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$RestoreAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
new file mode 100644
index 00000000000..edf1553f8d3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$SizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SizeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$SizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
new file mode 100644
index 00000000000..9510859b96a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
+
+#pragma interface
+
+#include <javax/swing/JMenuBar.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$SystemMenuBar;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SystemMenuBar : public ::javax::swing::JMenuBar
+{
+
+public:
+  BasicInternalFrameTitlePane$SystemMenuBar(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual jboolean isFocusTraversable();
+  virtual jboolean isOpaque();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void requestFocus();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
new file mode 100644
index 00000000000..4dedb42bd2c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$TitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$TitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameTitlePane$TitlePaneLayout(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
new file mode 100644
index 00000000000..68b826b2f97
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
@@ -0,0 +1,110 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class FontMetrics;
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JInternalFrame;
+        class JLabel;
+        class JMenu;
+        class JMenuBar;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane : public ::javax::swing::JComponent
+{
+
+public:
+  BasicInternalFrameTitlePane(::javax::swing::JInternalFrame *);
+public: // actually protected
+  virtual void installTitlePane();
+  virtual void addSubComponents();
+  virtual void createActions();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void createButtons();
+  virtual void setButtonIcons();
+  virtual void assembleSystemMenu();
+  virtual void addSystemMenuItems(::javax::swing::JMenu *);
+  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
+  virtual ::javax::swing::JMenu * createSystemMenu();
+  virtual void showSystemMenu();
+public:
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintTitleBackground(::java::awt::Graphics *);
+  virtual ::java::lang::String * getTitle(::java::lang::String *, ::java::awt::FontMetrics *, jint);
+  virtual void postClosingEvent(::javax::swing::JInternalFrame *);
+  virtual void enableActions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::LayoutManager * createLayout();
+  static ::java::lang::String * CLOSE_CMD;
+  static ::java::lang::String * ICONIFY_CMD;
+  static ::java::lang::String * MAXIMIZE_CMD;
+  static ::java::lang::String * MOVE_CMD;
+  static ::java::lang::String * RESTORE_CMD;
+  static ::java::lang::String * SIZE_CMD;
+  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closeAction;
+  ::javax::swing::Action * iconifyAction;
+  ::javax::swing::Action * maximizeAction;
+  ::javax::swing::Action * moveAction;
+  ::javax::swing::Action * restoreAction;
+  ::javax::swing::Action * sizeAction;
+  ::javax::swing::JButton * closeButton;
+  ::javax::swing::JButton * iconButton;
+  ::javax::swing::JButton * maxButton;
+  ::javax::swing::Icon * minIcon;
+  ::javax::swing::Icon * maxIcon;
+  ::javax::swing::Icon * iconIcon;
+  ::javax::swing::Icon * closeIcon;
+  ::javax::swing::JInternalFrame * frame;
+  ::javax::swing::JMenuBar * menuBar;
+  ::javax::swing::JMenu * windowMenu;
+  ::java::awt::Color * notSelectedTextColor;
+  ::java::awt::Color * notSelectedTitleColor;
+  ::java::awt::Color * selectedTextColor;
+  ::java::awt::Color * selectedTitleColor;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
new file mode 100644
index 00000000000..d1d36649a61
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class InternalFrameEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BasicInternalFrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$BasicInternalFrameListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
new file mode 100644
index 00000000000..18a50e63a35
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BorderListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$BorderListener : public ::javax::swing::event::MouseInputAdapter
+{
+
+public: // actually protected
+  BasicInternalFrameUI$BorderListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void setCursor(::java::awt::event::MouseEvent *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  jint sectionOfClick(jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) showingCursor;
+public: // actually protected
+  const jint RESIZE_NONE;
+private:
+  jint xOffset;
+  jint yOffset;
+  jint direction;
+  ::java::awt::Rectangle * cacheRect;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
new file mode 100644
index 00000000000..aeedc9352f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$ComponentHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$ComponentHandler(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void componentHidden(::java::awt::event::ComponentEvent *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+  virtual void componentShown(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
new file mode 100644
index 00000000000..24529023260
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$GlassPaneDispatcher;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$GlassPaneDispatcher : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$GlassPaneDispatcher(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  void handleEvent(::java::awt::event::MouseEvent *);
+  void redispatch(jint, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mouseEventTarget;
+  ::java::awt::Component * dragTarget;
+  jboolean isDragging;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
new file mode 100644
index 00000000000..a5ddab06727
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public: // actually package-private
+  BasicInternalFrameUI$InternalFrameBorder(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual jboolean isBorderOpaque();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  static const jint bSize = 5;
+  static const jint cornerSize = 10;
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
new file mode 100644
index 00000000000..6ff8ae9abf5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFrameLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameLayout : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameUI$InternalFrameLayout(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+private:
+  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
+public:
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
new file mode 100644
index 00000000000..c1a37ba0d18
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFramePropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFramePropertyChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameUI$InternalFramePropertyChangeListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
new file mode 100644
index 00000000000..9b43d26dfdf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$ShowSystemMenuAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction : public ::javax::swing::AbstractAction
+{
+
+  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *, ::javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction *);
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
new file mode 100644
index 00000000000..18aa9207e30
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
@@ -0,0 +1,139 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/InternalFrameUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class LayoutManager;
+      namespace event
+      {
+          class ComponentListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DesktopManager;
+        class JComponent;
+        class JDesktopPane;
+        class JInternalFrame;
+        class KeyStroke;
+      namespace event
+      {
+          class MouseInputAdapter;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BasicInternalFrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
+{
+
+public:
+  BasicInternalFrameUI(::javax::swing::JInternalFrame *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installComponents();
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallComponents();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void replacePane(::javax::swing::JComponent *, ::javax::swing::JComponent *);
+  virtual void deinstallMouseHandlers(::javax::swing::JComponent *);
+  virtual void installMouseHandlers(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createWestPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createSouthPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createEastPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::event::MouseInputAdapter * createBorderListener(::javax::swing::JInternalFrame *);
+  virtual void createInternalFrameListener();
+  virtual jboolean isKeyBindingRegistered();
+  virtual void setKeyBindingRegistered(jboolean);
+public:
+  virtual jboolean isKeyBindingActive();
+public: // actually protected
+  virtual void setKeyBindingActive(jboolean);
+  virtual void setupMenuOpenKey();
+  virtual void setupMenuCloseKey();
+public:
+  virtual ::javax::swing::JComponent * getNorthPane();
+  virtual void setNorthPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getSouthPane();
+  virtual void setSouthPane(::javax::swing::JComponent *);
+  virtual void setEastPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getEastPane();
+  virtual void setWestPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getWestPane();
+public: // actually protected
+  virtual ::javax::swing::DesktopManager * getDesktopManager();
+  virtual ::javax::swing::DesktopManager * createDesktopManager();
+  virtual void closeFrame(::javax::swing::JInternalFrame *);
+  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
+  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
+  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void activateFrame(::javax::swing::JInternalFrame *);
+  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
+  virtual ::java::awt::event::ComponentListener * createComponentListener();
+  virtual ::javax::swing::event::MouseInputListener * createGlassPaneDispatcher();
+  ::javax::swing::event::MouseInputAdapter * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) borderListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::javax::swing::event::MouseInputListener * glassPaneDispatcher;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+private:
+  ::javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener * internalFrameListener;
+public: // actually protected
+  ::javax::swing::JComponent * eastPane;
+  ::javax::swing::JComponent * northPane;
+  ::javax::swing::JComponent * southPane;
+  ::javax::swing::JComponent * westPane;
+  ::javax::swing::KeyStroke * openMenuKey;
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * titlePane;
+  ::javax::swing::JInternalFrame * frame;
+  ::java::awt::LayoutManager * internalFrameLayout;
+private:
+  ::javax::swing::JDesktopPane * desktopPane;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
new file mode 100644
index 00000000000..3ef661852f6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLabelUI$1__
+#define __javax_swing_plaf_basic_BasicLabelUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLabelUI;
+            class BasicLabelUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLabelUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicLabelUI$1(::javax::swing::plaf::basic::BasicLabelUI *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLabelUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
new file mode 100644
index 00000000000..e0d39a24189
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLabelUI__
+#define __javax_swing_plaf_basic_BasicLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/LabelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class FontMetrics;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JLabel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLabelUI : public ::javax::swing::plaf::LabelUI
+{
+
+public:
+  BasicLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * layoutCL(::javax::swing::JLabel *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+  virtual void paintEnabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents(::javax::swing::JLabel *);
+  virtual void uninstallComponents(::javax::swing::JLabel *);
+  virtual void installDefaults(::javax::swing::JLabel *);
+  virtual void uninstallDefaults(::javax::swing::JLabel *);
+  virtual void installKeyboardActions(::javax::swing::JLabel *);
+  virtual void uninstallKeyboardActions(::javax::swing::JLabel *);
+  virtual void installListeners(::javax::swing::JLabel *);
+  virtual void uninstallListeners(::javax::swing::JLabel *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually protected
+  static ::javax::swing::plaf::basic::BasicLabelUI * labelUI;
+private:
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) vr;
+  ::java::awt::Rectangle * ir;
+  ::java::awt::Rectangle * tr;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLabelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
new file mode 100644
index 00000000000..48cfc19f080
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
+#define __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI$ActionListenerProxy;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ActionListenerProxy : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicListUI$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
+  ::java::lang::String * bindingCommandName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
new file mode 100644
index 00000000000..a79c2a9fb77
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicListUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$FocusHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually protected
+  virtual void repaintCellFocus();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
new file mode 100644
index 00000000000..0cec9aa6e6f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListAction__
+#define __javax_swing_plaf_basic_BasicListUI$ListAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicListUI$ListAction(::javax::swing::plaf::basic::BasicListUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
new file mode 100644
index 00000000000..f0c6a1579aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$ListDataHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
new file mode 100644
index 00000000000..8211c698210
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
+#define __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$ListSelectionHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
new file mode 100644
index 00000000000..deb7b583233
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$MouseInputHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..8993d1b387b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.h b/libjava/javax/swing/plaf/basic/BasicListUI.h
new file mode 100644
index 00000000000..2d0d79d84d0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI.h
@@ -0,0 +1,128 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI__
+#define __javax_swing_plaf_basic_BasicListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ListUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class JComponent;
+        class JList;
+        class ListCellRenderer;
+        class ListModel;
+        class ListSelectionModel;
+      namespace event
+      {
+          class ListDataListener;
+          class ListSelectionListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI : public ::javax::swing::plaf::ListUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getRowHeight(jint);
+public:
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
+private:
+  jint getCellHeight(jint);
+public: // actually protected
+  virtual jint convertRowToY(jint);
+  virtual jint convertYToRow(jint);
+  virtual void updateLayoutState();
+  virtual void maybeUpdateLayoutState();
+public:
+  BasicListUI();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintCell(::java::awt::Graphics *, jint, ::java::awt::Rectangle *, ::javax::swing::ListCellRenderer *, ::javax::swing::ListModel *, ::javax::swing::ListSelectionModel *, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
+public: // actually protected
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void selectNextIndex();
+  virtual void selectPreviousIndex();
+  static const jint modelChanged = 1;
+  static const jint selectionModelChanged = 2;
+  static const jint fontChanged = 4;
+  static const jint fixedCellWidthChanged = 8;
+  static const jint fixedCellHeightChanged = 16;
+  static const jint prototypeCellValueChanged = 32;
+  static const jint cellRendererChanged = 64;
+  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) focusListener;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::javax::swing::event::ListSelectionListener * listSelectionListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JList * list;
+  jint cellHeight;
+  jint cellWidth;
+  JArray< jint > * cellHeights;
+  jint updateLayoutStateNeeded;
+  ::javax::swing::CellRendererPane * rendererPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI$ListAction * action;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
new file mode 100644
index 00000000000..f9fdb495a01
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$1__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$1(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
new file mode 100644
index 00000000000..fccc19c0343
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$2__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$2(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
new file mode 100644
index 00000000000..5410fc36638
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$3__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$3(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
new file mode 100644
index 00000000000..6a9c8c77d55
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$4__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$4__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$4 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$4(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
new file mode 100644
index 00000000000..605519940f3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$5__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$5__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$5 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$5(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
new file mode 100644
index 00000000000..71ba0d5a477
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$6__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$6__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$6 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$6(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
new file mode 100644
index 00000000000..37d256cd95b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$7__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$7__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$7 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$7(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
new file mode 100644
index 00000000000..0227ab30e5e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$AudioAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$AudioAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicLookAndFeel$AudioAction(::javax::swing::plaf::basic::BasicLookAndFeel *, ::java::lang::Object *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) key;
+  ::javax::swing::plaf::basic::BasicLookAndFeel * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
new file mode 100644
index 00000000000..03118997e46
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class AWTEvent;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$PopupHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper : public ::java::lang::Object
+{
+
+  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual void eventDispatched(::java::awt::AWTEvent *);
+private:
+  void mousePressed(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *, ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper *);
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
new file mode 100644
index 00000000000..13b4adac44a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel__
+#define __javax_swing_plaf_basic_BasicLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/LookAndFeel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class ActionMap;
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$PopupHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel : public ::javax::swing::LookAndFeel
+{
+
+public:
+  BasicLookAndFeel();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+public: // actually protected
+  virtual void initClassDefaults(::javax::swing::UIDefaults *);
+  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
+  virtual void loadSystemColors(::javax::swing::UIDefaults *, JArray< ::java::lang::String * > *, jboolean);
+private:
+  void loadResourceBundle(::javax::swing::UIDefaults *);
+public: // actually protected
+  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
+  virtual ::javax::swing::ActionMap * getAudioActionMap();
+  virtual ::javax::swing::Action * createAudioAction(::java::lang::Object *);
+  virtual void playSound(::javax::swing::Action *);
+public:
+  virtual void initialize();
+  virtual void uninitialize();
+public: // actually package-private
+  static const jlong serialVersionUID = -6096995660290287879LL;
+  static ::java::lang::String * DONT_CANCEL_POPUP;
+private:
+  ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper * __attribute__((aligned(__alignof__( ::javax::swing::LookAndFeel)))) popupHelper;
+  ::javax::swing::ActionMap * audioActionMap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
new file mode 100644
index 00000000000..106c4d95b7d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
new file mode 100644
index 00000000000..fe9e6810ab0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$ContainerHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
new file mode 100644
index 00000000000..b1882e190cc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI$FocusAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$FocusAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuBarUI$FocusAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
new file mode 100644
index 00000000000..80b279360c4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..0365962d28a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
new file mode 100644
index 00000000000..27b85de909a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
@@ -0,0 +1,93 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI__
+#define __javax_swing_plaf_basic_BasicMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class ContainerListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JMenuBar;
+      namespace event
+      {
+          class ChangeListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI : public ::javax::swing::plaf::MenuBarUI
+{
+
+public:
+  BasicMenuBarUI();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+  virtual ::java::awt::event::ContainerListener * createContainerListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) changeListener;
+  ::java::awt::event::ContainerListener * containerListener;
+private:
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually protected
+  ::javax::swing::JMenuBar * menuBar;
+private:
+  ::javax::swing::event::MouseInputListener * mouseListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
new file mode 100644
index 00000000000..ffdf9672aaa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$ClickAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$ClickAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuItemUI$ClickAction(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
new file mode 100644
index 00000000000..f2746bf14c3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
new file mode 100644
index 00000000000..775a4f78ca1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuDragMouseEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MenuDragMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
+public: // actually package-private
+  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
new file mode 100644
index 00000000000..db70c21c631
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuKeyEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MenuKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
+public: // actually package-private
+  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
new file mode 100644
index 00000000000..6f735f39320
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicMenuItemUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..203bd657685
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicMenuItemUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
new file mode 100644
index 00000000000..c602c23106e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
@@ -0,0 +1,132 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI__
+#define __javax_swing_plaf_basic_BasicMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Graphics;
+        class Rectangle;
+      namespace event
+      {
+          class ItemListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class MenuDragMouseListener;
+          class MenuKeyListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI : public ::javax::swing::plaf::MenuItemUI
+{
+
+public:
+  BasicMenuItemUI();
+public: // actually protected
+  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void doClick(::javax::swing::MenuSelectionManager *);
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::MenuElement * > * getPath();
+public: // actually protected
+  virtual ::java::awt::Dimension * getPreferredMenuItemSize(::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installComponents(::javax::swing::JMenuItem *);
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintBackground(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Color *);
+  virtual void paintMenuItem(::java::awt::Graphics *, ::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, ::java::awt::Color *, ::java::awt::Color *, jint);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void uninstallComponents(::javax::swing::JMenuItem *);
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::java::lang::String * getAcceleratorString(::javax::swing::JMenuItem *);
+  void resetRectangles(::javax::swing::JMenuItem *);
+  void layoutMenuItem(::javax::swing::JMenuItem *, ::java::lang::String *);
+public: // actually protected
+  ::java::awt::Font * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) acceleratorFont;
+  ::java::awt::Color * acceleratorForeground;
+  ::java::awt::Color * acceleratorSelectionForeground;
+  ::javax::swing::Icon * arrowIcon;
+  ::javax::swing::Icon * checkIcon;
+  jint defaultTextIconGap;
+  ::java::awt::Color * disabledForeground;
+  ::javax::swing::event::MenuDragMouseListener * menuDragMouseListener;
+  ::javax::swing::JMenuItem * menuItem;
+  ::javax::swing::event::MenuKeyListener * menuKeyListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  jboolean oldBorderPainted;
+  ::java::awt::Color * selectionBackground;
+  ::java::awt::Color * selectionForeground;
+private:
+  ::java::lang::String * acceleratorDelimiter;
+  ::java::awt::event::ItemListener * itemListener;
+  ::javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler * propertyChangeListener;
+  ::java::awt::Rectangle * viewRect;
+  ::java::awt::Rectangle * textRect;
+  ::java::awt::Rectangle * accelRect;
+  ::java::awt::Rectangle * iconRect;
+  ::java::awt::Rectangle * arrowIconRect;
+  ::java::awt::Rectangle * checkIconRect;
+  ::java::awt::Rectangle * cachedRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
new file mode 100644
index 00000000000..44eeca1219c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenu;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicMenuUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::JMenu *, ::javax::swing::plaf::basic::BasicMenuUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isSelected;
+  ::javax::swing::JMenu * menu;
+  ::javax::swing::plaf::basic::BasicMenuUI * ui;
+  ::java::awt::Component * wasFocused;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
new file mode 100644
index 00000000000..39cc8f9f8c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuDragMouseEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuDragMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
new file mode 100644
index 00000000000..eb519164dae
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuCanceled(::javax::swing::event::MenuEvent *);
+  virtual void menuDeselected(::javax::swing::event::MenuEvent *);
+  virtual void menuSelected(::javax::swing::event::MenuEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
new file mode 100644
index 00000000000..be2f9ca155d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuKeyEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
new file mode 100644
index 00000000000..c5e1e4064dd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicMenuUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+private:
+  jboolean popupVisible();
+public:
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
new file mode 100644
index 00000000000..97815775285
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
+#define __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$SelectMenuAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$SelectMenuAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuUI$SelectMenuAction(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.h b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
new file mode 100644
index 00000000000..d3ae59e3592
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI__
+#define __javax_swing_plaf_basic_BasicMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenu;
+      namespace event
+      {
+          class ChangeListener;
+          class MenuDragMouseListener;
+          class MenuKeyListener;
+          class MenuListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicMenuUI();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuListener * createMenuListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+  virtual void setupPostTimer(::javax::swing::JMenu *);
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicMenuItemUI)))) changeListener;
+  ::javax::swing::event::MenuListener * menuListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
new file mode 100644
index 00000000000..a79d5d0abdd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$1__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$1 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$1();
+public:
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
new file mode 100644
index 00000000000..3a5048f2575
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$2__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$2 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$2();
+public:
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
new file mode 100644
index 00000000000..b93960b0de3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$3__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$3 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$3();
+public:
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
new file mode 100644
index 00000000000..952df65bb7d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$4__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$4 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$4();
+public:
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
new file mode 100644
index 00000000000..575b2b79c74
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$ButtonActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonActionListener : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$ButtonActionListener(::javax::swing::plaf::basic::BasicOptionPaneUI *, jint);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttonIndex;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicOptionPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
new file mode 100644
index 00000000000..06671ddd4fa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$ButtonAreaLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonAreaLayout : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$ButtonAreaLayout(jboolean, jint);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual jboolean getCentersChildren();
+  virtual jint getPadding();
+  virtual jboolean getSyncAllWidths();
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  jint buttonRowLength(::java::awt::Container *);
+public:
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual void setCentersChildren(jboolean);
+  virtual void setPadding(jint);
+  virtual void setSyncAllWidths(jboolean);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) centersChildren;
+  jint padding;
+  jboolean syncAllWidths;
+private:
+  jint widthOfWidestButton;
+  jint tallestButton;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
new file mode 100644
index 00000000000..a820f3cbe25
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$MessageIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon : public ::java::lang::Object
+{
+
+  BasicOptionPaneUI$MessageIcon();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  BasicOptionPaneUI$MessageIcon(::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
new file mode 100644
index 00000000000..81dcc99f3e9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$OptionPaneCloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$OptionPaneCloseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$OptionPaneCloseAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..02b236c47a6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicOptionPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicOptionPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
new file mode 100644
index 00000000000..50aa3b4ee65
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
@@ -0,0 +1,148 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/OptionPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class GridBagConstraints;
+        class LayoutManager;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class Icon;
+        class JComponent;
+        class JLabel;
+        class JOptionPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$MessageIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
+{
+
+public:
+  BasicOptionPaneUI();
+public: // actually protected
+  virtual void addButtonComponents(::java::awt::Container *, JArray< ::java::lang::Object * > *, jint);
+  virtual void addIcon(::java::awt::Container *);
+private:
+  static ::java::awt::GridBagConstraints * createConstraints();
+public: // actually protected
+  virtual void addMessageComponents(::java::awt::Container *, ::java::awt::GridBagConstraints *, ::java::lang::Object *, jint, jboolean);
+  virtual void burstStringInto(::java::awt::Container *, ::java::lang::String *, jint);
+public:
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
+public: // actually protected
+  virtual ::java::awt::event::ActionListener * createButtonActionListener(jint);
+  virtual ::java::awt::Container * createButtonArea();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::java::awt::Container * createMessageArea();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::Container * createSeparator();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual JArray< ::java::lang::Object * > * getButtons();
+  virtual ::javax::swing::Icon * getIcon();
+  virtual ::javax::swing::Icon * getIconForType(jint);
+  virtual jint getInitialValueIndex();
+  virtual jint getMaxCharactersPerLineCount();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::Object * getMessage();
+public:
+  virtual ::java::awt::Dimension * getMinimumOptionPaneSize();
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jboolean getSizeButtonsToSameWidth();
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void resetInputValue();
+public:
+  virtual void selectInitialValue(::javax::swing::JOptionPane *);
+public: // actually package-private
+  virtual void resetSelectedValue();
+public: // actually protected
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+private:
+  void configureLabel(::javax::swing::JLabel *);
+public:
+  static const jint MinimumWidth = 262;
+  static const jint MinimumHeight = 90;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) hasCustomComponents;
+  ::java::awt::Component * initialFocusComponent;
+  ::javax::swing::JComponent * inputComponent;
+  ::java::awt::Dimension * minimumSize;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JOptionPane * optionPane;
+private:
+  static const jint ICON_SIZE = 36;
+  static ::java::lang::String * OK_STRING;
+  static ::java::lang::String * YES_STRING;
+  static ::java::lang::String * NO_STRING;
+  static ::java::lang::String * CANCEL_STRING;
+public: // actually package-private
+  ::java::awt::Container * messageAreaContainer;
+  ::java::awt::Container * buttonContainer;
+private:
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * errorIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * infoIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * warningIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * questionIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPanelUI.h b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
new file mode 100644
index 00000000000..5fcf6fe892a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPanelUI__
+#define __javax_swing_plaf_basic_BasicPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PanelUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JPanel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPanelUI : public ::javax::swing::plaf::PanelUI
+{
+
+public:
+  BasicPanelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JPanel *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JPanel *);
+public: // actually package-private
+  static ::javax::swing::plaf::basic::BasicPanelUI * sharedUI;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
new file mode 100644
index 00000000000..fcbb8732fa3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPasswordFieldUI__
+#define __javax_swing_plaf_basic_BasicPasswordFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPasswordFieldUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPasswordFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  BasicPasswordFieldUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPasswordFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
new file mode 100644
index 00000000000..d5082f9d18e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
+#define __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPopupMenuSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  BasicPopupMenuSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
new file mode 100644
index 00000000000..5fb04078aea
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class JRootPane;
+        class MenuElement;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$KeyboardHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+private:
+  ::javax::swing::JPopupMenu * getActivePopup(JArray< ::javax::swing::MenuElement * > *);
+  jboolean invokerEquals(::javax::swing::MenuElement *, ::javax::swing::MenuElement *);
+public: // actually package-private
+  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper *);
+private:
+  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastSelectedPath;
+  ::java::awt::Component * lastFocused;
+  ::javax::swing::JRootPane * invokerRootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
new file mode 100644
index 00000000000..03fb5accb8d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class MenuElement;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicPopupMenuUI$NavigateAction(::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  void navigateNextPrevious(jboolean);
+  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuElement *, jboolean);
+  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jboolean);
+  ::javax::swing::MenuElement * findNextEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
+  ::javax::swing::MenuElement * findPreviousEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
+  void navigateParentChild(jboolean);
+  void cancel();
+  ::javax::swing::JPopupMenu * getLastPopup();
+  void doReturn();
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
new file mode 100644
index 00000000000..3b8b580abb3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class PopupMenuEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$PopupMenuHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *);
+  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *);
+  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *);
+public: // actually package-private
+  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler *);
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
new file mode 100644
index 00000000000..e88a2f884ff
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$TopWindowListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+  virtual void componentShown(::java::awt::event::ComponentEvent *);
+  virtual void componentHidden(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener *);
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
new file mode 100644
index 00000000000..95bf37a9373
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PopupMenuUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JPopupMenu;
+      namespace event
+      {
+          class PopupMenuListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$KeyboardHelper;
+            class BasicPopupMenuUI$TopWindowListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
+{
+
+public:
+  BasicPopupMenuUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void installDefaults();
+public: // actually protected
+  virtual void installListeners();
+  virtual void installKeyboardActions();
+public: // actually package-private
+  virtual void installKeyboardActionsImpl();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+public: // actually package-private
+  virtual void uninstallKeyboardActionsImpl();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
+public: // actually protected
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) popupMenu;
+private:
+  ::javax::swing::event::PopupMenuListener * popupMenuListener;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener * topWindowListener;
+private:
+  static jint numPopups;
+  static ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper * keyboardHelper;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
new file mode 100644
index 00000000000..54768d3a388
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class AncestorEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$AncestorHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *);
+  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *);
+  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *);
+public: // actually package-private
+  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
new file mode 100644
index 00000000000..31c00bc61ee
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$Animator;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$Animator : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$Animator *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
new file mode 100644
index 00000000000..e8296621a2d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicProgressBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
new file mode 100644
index 00000000000..2f20e0f2490
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..9d0d136fcaf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
new file mode 100644
index 00000000000..85263b9378e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
@@ -0,0 +1,123 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI__
+#define __javax_swing_plaf_basic_BasicProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ProgressBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JProgressBar;
+        class Timer;
+      namespace event
+      {
+          class AncestorListener;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$Animator;
+            class BasicProgressBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
+{
+
+public:
+  BasicProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getAmountFull(::java::awt::Insets *, jint, jint);
+  virtual jint getAnimationIndex();
+  virtual ::java::awt::Rectangle * getBox(::java::awt::Rectangle *);
+  virtual jint getCellLength();
+  virtual jint getCellSpacing();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getPreferredInnerHorizontal();
+  virtual ::java::awt::Dimension * getPreferredInnerVertical();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Color * getSelectionBackground();
+  virtual ::java::awt::Color * getSelectionForeground();
+  virtual ::java::awt::Point * getStringPlacement(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint, jint);
+  virtual void incrementAnimationIndex();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintString(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Insets *);
+  virtual void setAnimationIndex(jint);
+  virtual void setCellLength(jint);
+  virtual void setCellSpacing(jint);
+  virtual void startAnimationTimer();
+  virtual void stopAnimationTimer();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) boxRect;
+private:
+  ::javax::swing::Timer * animationTimer;
+  jint animationIndex;
+  jint numFrames;
+  ::javax::swing::plaf::basic::BasicProgressBarUI$Animator * animation;
+  ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler * propertyListener;
+public: // actually protected
+  ::javax::swing::event::ChangeListener * changeListener;
+  ::javax::swing::JProgressBar * progressBar;
+public: // actually package-private
+  jdouble boxDependent;
+  jint boxIndependent;
+  jdouble incr;
+private:
+  jint cellLength;
+  jint cellSpacing;
+  ::java::awt::Color * selectionBackground;
+  ::java::awt::Color * selectionForeground;
+  ::javax::swing::event::AncestorListener * ancestorListener;
+  ::java::awt::event::ComponentListener * componentListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
new file mode 100644
index 00000000000..5439b6722fe
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
+#define __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRadioButtonMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRadioButtonMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicRadioButtonMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
new file mode 100644
index 00000000000..62b3a3c2823
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRadioButtonUI__
+#define __javax_swing_plaf_basic_BasicRadioButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class Icon;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRadioButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRadioButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicRadioButtonUI();
+public: // actually protected
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual ::javax::swing::Icon * getDefaultIcon();
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) icon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
new file mode 100644
index 00000000000..040c915022d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
+#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JRootPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicRootPaneUI;
+            class BasicRootPaneUI$DefaultPressAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI$DefaultPressAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicRootPaneUI$DefaultPressAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
new file mode 100644
index 00000000000..1728960926d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
+#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JRootPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicRootPaneUI;
+            class BasicRootPaneUI$DefaultReleaseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI$DefaultReleaseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicRootPaneUI$DefaultReleaseAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
new file mode 100644
index 00000000000..cf222b76fb6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI__
+#define __javax_swing_plaf_basic_BasicRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/RootPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JRootPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI : public ::javax::swing::plaf::RootPaneUI
+{
+
+public:
+  BasicRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JRootPane *);
+  virtual void installComponents(::javax::swing::JRootPane *);
+  virtual void installListeners(::javax::swing::JRootPane *);
+  virtual void installKeyboardActions(::javax::swing::JRootPane *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JRootPane *);
+  virtual void uninstallComponents(::javax::swing::JRootPane *);
+  virtual void uninstallListeners(::javax::swing::JRootPane *);
+  virtual void uninstallKeyboardActions(::javax::swing::JRootPane *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
new file mode 100644
index 00000000000..740dea9e590
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$1__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$1(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
new file mode 100644
index 00000000000..1eeb4071191
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$2__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$2(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
new file mode 100644
index 00000000000..1ae61baf033
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$3__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$3(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
new file mode 100644
index 00000000000..e8c2e5c5ea6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$4__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$4(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
new file mode 100644
index 00000000000..49c987f31e9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$5__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$5(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
new file mode 100644
index 00000000000..9c0fb6671cf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$6__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$6(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
new file mode 100644
index 00000000000..85d942986d5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ArrowButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicScrollBarUI$ArrowButtonListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
new file mode 100644
index 00000000000..472d5bd4b19
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ModelListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ModelListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicScrollBarUI$ModelListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..b2afd716343
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollBarUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
new file mode 100644
index 00000000000..193e13f595e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ScrollListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *, jint, jboolean);
+  virtual void setDirection(jint);
+  virtual void setScrollByBlock(jboolean);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
+  jboolean block;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
new file mode 100644
index 00000000000..b78648a31e2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$TrackListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicScrollBarUI$TrackListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jboolean shouldScroll(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) currentMouseX;
+  jint currentMouseY;
+  jint offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
new file mode 100644
index 00000000000..64cd923aca4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
@@ -0,0 +1,174 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI__
+#define __javax_swing_plaf_basic_BasicScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JButton;
+        class JComponent;
+        class JScrollBar;
+        class Timer;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ArrowButtonListener;
+            class BasicScrollBarUI$ModelListener;
+            class BasicScrollBarUI$ScrollListener;
+            class BasicScrollBarUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
+{
+
+public:
+  BasicScrollBarUI();
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+public: // actually protected
+  virtual void configureScrollBarColors();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * createArrowButtonListener();
+  virtual ::javax::swing::JButton * createIncreaseButton(jint);
+  virtual ::javax::swing::JButton * createDecreaseButton(jint);
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * createModelListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * createScrollListener();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * createTrackListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMaximumThumbSize();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMinimumThumbSize();
+public: // actually package-private
+  virtual void calculatePreferredSize();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getThumbBounds();
+  virtual ::java::awt::Rectangle * getTrackBounds();
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually protected
+  virtual void layoutHScrollbar(::javax::swing::JScrollBar *);
+  virtual void layoutVScrollbar(::javax::swing::JScrollBar *);
+public: // actually package-private
+  virtual void updateThumbRect();
+public:
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDecreaseHighlight(::java::awt::Graphics *);
+  virtual void paintIncreaseHighlight(::java::awt::Graphics *);
+  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually protected
+  virtual void scrollByBlock(jint);
+public: // actually package-private
+  static void scrollByBlock(::javax::swing::JScrollBar *, jint);
+public: // actually protected
+  virtual void scrollByUnit(jint);
+public: // actually package-private
+  static void scrollByUnits(::javax::swing::JScrollBar *, jint, jint);
+public: // actually protected
+  virtual void setThumbBounds(jint, jint, jint, jint);
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual jint valueForYPosition(jint);
+  virtual jint valueForXPosition(jint);
+public:
+  virtual jboolean isThumbRollover();
+public: // actually protected
+  virtual void setThumbRollover(jboolean);
+public:
+  virtual jboolean getSupportsAbsolutePositioning();
+public: // actually protected
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) buttonListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * modelListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * scrollListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * trackListener;
+  ::javax::swing::JButton * decrButton;
+  ::javax::swing::JButton * incrButton;
+  ::java::awt::Dimension * maximumThumbSize;
+  ::java::awt::Dimension * minimumThumbSize;
+  ::java::awt::Color * thumbColor;
+  ::java::awt::Color * thumbDarkShadowColor;
+  ::java::awt::Color * thumbHighlightColor;
+  ::java::awt::Color * thumbLightShadowColor;
+  ::java::awt::Color * trackHighlightColor;
+  ::java::awt::Color * trackColor;
+  ::java::awt::Rectangle * trackRect;
+  ::java::awt::Rectangle * thumbRect;
+  static const jint DECREASE_HIGHLIGHT = 1;
+  static const jint INCREASE_HIGHLIGHT = 2;
+  static const jint NO_HIGHLIGHT = 0;
+private:
+  static const jint POSITIVE_SCROLL = 1;
+  static const jint NEGATIVE_SCROLL = -1;
+  ::java::awt::Dimension * preferredSize;
+public: // actually protected
+  jint trackHighlight;
+  jboolean isDragging;
+  ::javax::swing::Timer * scrollTimer;
+  ::javax::swing::JScrollBar * scrollbar;
+public: // actually package-private
+  jboolean thumbRollover;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
new file mode 100644
index 00000000000..d2f99fd0748
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$1__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$1(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
new file mode 100644
index 00000000000..ca4ee4a0a11
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$10__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$10__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$10;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$10 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$10(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$10__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
new file mode 100644
index 00000000000..7cf273faac2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$2__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$2(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
new file mode 100644
index 00000000000..08fdef8fae3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$3__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$3(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
new file mode 100644
index 00000000000..619ffa5af10
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$4__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$4(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
new file mode 100644
index 00000000000..474733112e7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$5__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$5(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
new file mode 100644
index 00000000000..03dad8e7411
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$6__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$6(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
new file mode 100644
index 00000000000..df4635ef2e9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$7__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$7__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$7 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$7(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
new file mode 100644
index 00000000000..04e372cbe51
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$8__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$8__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$8;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$8 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$8(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
new file mode 100644
index 00000000000..24028ace0ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$9__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$9__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$9;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$9 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$9(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$9__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
new file mode 100644
index 00000000000..b4cd0559369
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$HSBChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$HSBChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$HSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
new file mode 100644
index 00000000000..33a3deb5d0b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class MouseWheelEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$MouseWheelHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$MouseWheelHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicScrollPaneUI$MouseWheelHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+public:
+  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
+public: // actually package-private
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rect;
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..d41feb6d487
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
new file mode 100644
index 00000000000..53c4f804bf2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$VSBChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$VSBChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$VSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
new file mode 100644
index 00000000000..abbdc71b258
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$ViewportChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$ViewportChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
new file mode 100644
index 00000000000..d0ca2438dbc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$ViewportContainerListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportContainerListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$ViewportContainerListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
new file mode 100644
index 00000000000..c06cf939f6f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
@@ -0,0 +1,108 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+      namespace event
+      {
+          class ContainerListener;
+          class MouseWheelListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JScrollPane;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
+{
+
+public:
+  BasicScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JScrollPane *);
+  virtual void uninstallDefaults(::javax::swing::JScrollPane *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installListeners(::javax::swing::JScrollPane *);
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installKeyboardActions(::javax::swing::JScrollPane *);
+  virtual void uninstallKeyboardActions(::javax::swing::JScrollPane *);
+  virtual ::javax::swing::event::ChangeListener * createHSBChangeListener();
+  virtual ::javax::swing::event::ChangeListener * createVSBChangeListener();
+  virtual ::javax::swing::event::ChangeListener * createViewportChangeListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::MouseWheelListener * createMouseWheelListener();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallListeners(::javax::swing::JComponent *);
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void syncScrollPaneWithViewport();
+  virtual void updateColumnHeader(::java::beans::PropertyChangeEvent *);
+  virtual void updateRowHeader(::java::beans::PropertyChangeEvent *);
+  virtual void updateScrollBarDisplayPolicy(::java::beans::PropertyChangeEvent *);
+  virtual void updateViewport(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  static jint SCROLL_NON_SCROLLABLES;
+  static jint ROWS_PER_WHEEL_CLICK;
+public: // actually protected
+  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) scrollpane;
+  ::javax::swing::event::ChangeListener * hsbChangeListener;
+  ::javax::swing::event::ChangeListener * vsbChangeListener;
+  ::javax::swing::event::ChangeListener * viewportChangeListener;
+  ::java::beans::PropertyChangeListener * spPropertyChangeListener;
+public: // actually package-private
+  ::java::awt::event::MouseWheelListener * mouseWheelListener;
+  ::java::awt::event::ContainerListener * containerListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
new file mode 100644
index 00000000000..f16b625f691
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSeparatorUI__
+#define __javax_swing_plaf_basic_BasicSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSeparator;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSeparatorUI : public ::javax::swing::plaf::SeparatorUI
+{
+
+public:
+  BasicSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSeparator *);
+  virtual void uninstallDefaults(::javax::swing::JSeparator *);
+  virtual void installListeners(::javax::swing::JSeparator *);
+  virtual void uninstallListeners(::javax::swing::JSeparator *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) shadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
new file mode 100644
index 00000000000..aeab13d16a1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$1__
+#define __javax_swing_plaf_basic_BasicSliderUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$1(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
new file mode 100644
index 00000000000..b5b1f9a5047
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$2__
+#define __javax_swing_plaf_basic_BasicSliderUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$2(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
new file mode 100644
index 00000000000..f5ebcd7bbb2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$3__
+#define __javax_swing_plaf_basic_BasicSliderUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$3(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
new file mode 100644
index 00000000000..e239d8ba159
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$4__
+#define __javax_swing_plaf_basic_BasicSliderUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$4(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
new file mode 100644
index 00000000000..1832658cd40
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$5__
+#define __javax_swing_plaf_basic_BasicSliderUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$5(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
new file mode 100644
index 00000000000..ef27bdf0f9b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$6__
+#define __javax_swing_plaf_basic_BasicSliderUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$6(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
new file mode 100644
index 00000000000..739b384edb7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
+#define __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSlider;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ActionScroller;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ActionScroller : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicSliderUI$ActionScroller(::javax::swing::plaf::basic::BasicSliderUI *, ::javax::swing::JSlider *, jint, jboolean);
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
new file mode 100644
index 00000000000..ee9305b54d8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$ChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
new file mode 100644
index 00000000000..f192a5bf04f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+public:
+  BasicSliderUI$ComponentHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
new file mode 100644
index 00000000000..bc91028571d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$FocusHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..b03823785a6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
new file mode 100644
index 00000000000..0032d4943cc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
+#define __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ScrollListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ScrollListener : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *);
+  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *, jint, jboolean);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void setDirection(jint);
+  virtual void setScrollByBlock(jboolean);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
+  jboolean block;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
new file mode 100644
index 00000000000..1d6bda1eb47
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
+#define __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$TrackListener : public ::javax::swing::event::MouseInputAdapter
+{
+
+public:
+  BasicSliderUI$TrackListener(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual jboolean shouldScroll(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) currentMouseX;
+  jint currentMouseY;
+  jint offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.h b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
new file mode 100644
index 00000000000..cb35faa26b0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
@@ -0,0 +1,188 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI__
+#define __javax_swing_plaf_basic_BasicSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SliderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JSlider;
+        class Timer;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ScrollListener;
+            class BasicSliderUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI : public ::javax::swing::plaf::SliderUI
+{
+
+public:
+  BasicSliderUI(::javax::swing::JSlider *);
+public: // actually protected
+  virtual jboolean isDragging();
+  virtual ::java::awt::Color * getShadowColor();
+  virtual ::java::awt::Color * getHighlightColor();
+  virtual ::java::awt::Color * getFocusColor();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSlider *);
+  virtual ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * createTrackListener(::javax::swing::JSlider *);
+  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JSlider *);
+  virtual ::java::awt::event::ComponentListener * createComponentListener(::javax::swing::JSlider *);
+  virtual ::java::awt::event::FocusListener * createFocusListener(::javax::swing::JSlider *);
+  virtual ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * createScrollListener(::javax::swing::JSlider *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
+  virtual void installListeners(::javax::swing::JSlider *);
+  virtual void uninstallListeners(::javax::swing::JSlider *);
+  virtual void installKeyboardActions(::javax::swing::JSlider *);
+  virtual void uninstallKeyboardActions(::javax::swing::JSlider *);
+public:
+  virtual ::java::awt::Dimension * getPreferredHorizontalSize();
+  virtual ::java::awt::Dimension * getPreferredVerticalSize();
+  virtual ::java::awt::Dimension * getMinimumHorizontalSize();
+  virtual ::java::awt::Dimension * getMinimumVerticalSize();
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void calculateGeometry();
+  virtual void calculateFocusRect();
+  virtual void calculateThumbSize();
+  virtual void calculateContentRect();
+  virtual void calculateThumbLocation();
+  virtual void calculateTrackBuffer();
+  virtual ::java::awt::Dimension * getThumbSize();
+  virtual void calculateTrackRect();
+  virtual jint getTickLength();
+  virtual void calculateTickRect();
+  virtual void calculateLabelRect();
+  virtual jint getWidthOfWidestLabel();
+  virtual jint getHeightOfTallestLabel();
+  virtual jint getWidthOfHighValueLabel();
+  virtual jint getWidthOfLowValueLabel();
+  virtual jint getHeightOfHighValueLabel();
+  virtual jint getHeightOfLowValueLabel();
+  virtual jboolean drawInverted();
+  virtual ::java::awt::Component * getLowestValueLabel();
+  virtual ::java::awt::Component * getHighestValueLabel();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void recalculateIfInsetsChanged();
+  virtual void recalculateIfOrientationChanged();
+public:
+  virtual void paintFocus(::java::awt::Graphics *);
+  virtual void paintTrack(::java::awt::Graphics *);
+  virtual void paintTicks(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+public:
+  virtual void paintLabels(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintHorizontalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
+  virtual void paintVerticalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
+public:
+  virtual void paintThumb(::java::awt::Graphics *);
+  virtual void setThumbLocation(jint, jint);
+  virtual void scrollByBlock(jint);
+  virtual void scrollByUnit(jint);
+public: // actually protected
+  virtual void scrollDueToClickInTrack(jint);
+  virtual jint xPositionForValue(jint);
+  virtual jint yPositionForValue(jint);
+public:
+  virtual jint valueForYPosition(jint);
+  virtual jint valueForXPosition(jint);
+public: // actually package-private
+  virtual jint findClosestTick(jint);
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+private:
+  jboolean hitClip(::java::awt::Graphics *, ::java::awt::Rectangle *);
+public: // actually protected
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) changeListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * scrollListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * trackListener;
+  ::java::awt::Insets * focusInsets;
+  ::java::awt::Insets * insetCache;
+  ::java::awt::Rectangle * contentRect;
+  ::java::awt::Rectangle * focusRect;
+  ::java::awt::Rectangle * thumbRect;
+  ::java::awt::Rectangle * tickRect;
+  ::java::awt::Rectangle * labelRect;
+  ::java::awt::Rectangle * trackRect;
+public:
+  static const jint MAX_SCROLL = 2;
+  static const jint MIN_SCROLL = -2;
+  static const jint NEGATIVE_SCROLL = -1;
+  static const jint POSITIVE_SCROLL = 1;
+public: // actually protected
+  jint trackBuffer;
+  jboolean leftToRightCache;
+  ::javax::swing::Timer * scrollTimer;
+  ::javax::swing::JSlider * slider;
+private:
+  ::java::awt::Color * shadowColor;
+  ::java::awt::Color * highlightColor;
+  ::java::awt::Color * focusColor;
+public: // actually package-private
+  jboolean dragging;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
new file mode 100644
index 00000000000..267014e841c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$1__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$1(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
new file mode 100644
index 00000000000..5d8697b83c5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$2__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$2__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$2 : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  BasicSpinnerUI$2(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  void mousePressed(::java::awt::event::MouseEvent *);
+  void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  void increment();
+  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
new file mode 100644
index 00000000000..1df1e20cc5f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$3__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI$2;
+            class BasicSpinnerUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$3(::javax::swing::plaf::basic::BasicSpinnerUI$2 *);
+public:
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
new file mode 100644
index 00000000000..0d9dddce85a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$4__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$4__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$4 : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  BasicSpinnerUI$4(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  void mousePressed(::java::awt::event::MouseEvent *);
+  void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  void decrement();
+  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
new file mode 100644
index 00000000000..f9a941a6559
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$5__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$5__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI$4;
+            class BasicSpinnerUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$5 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$5(::javax::swing::plaf::basic::BasicSpinnerUI$4 *);
+public:
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
new file mode 100644
index 00000000000..552ee52f5dd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$DefaultLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager : public ::java::lang::Object
+{
+
+  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+private:
+  ::java::awt::Dimension * prefSize(::java::awt::Component *);
+  void setBounds(::java::awt::Component *, jint, jint, jint, jint);
+public: // actually package-private
+  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *, ::javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager *);
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
+  ::java::awt::Component * next;
+  ::java::awt::Component * previous;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
new file mode 100644
index 00000000000..aa148b77187
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI__
+#define __javax_swing_plaf_basic_BasicSpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SpinnerUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSpinner;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSpinnerUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI : public ::javax::swing::plaf::SpinnerUI
+{
+
+public:
+  BasicSpinnerUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::JComponent * createEditor();
+  virtual ::java::awt::LayoutManager * createLayout();
+  virtual ::java::awt::Component * createNextButton();
+  virtual ::java::awt::Component * createPreviousButton();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void installDefaults();
+  virtual void installListeners();
+  virtual void installNextButtonListeners(::java::awt::Component *);
+  virtual void installPreviousButtonListeners(::java::awt::Component *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void replaceEditor(::javax::swing::JComponent *, ::javax::swing::JComponent *);
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) spinner;
+private:
+  ::java::beans::PropertyChangeListener * listener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
new file mode 100644
index 00000000000..cd51091307b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$BasicOneTouchButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$BasicOneTouchButton : public ::javax::swing::JButton
+{
+
+public: // actually package-private
+  BasicSplitPaneDivider$BasicOneTouchButton(::javax::swing::plaf::basic::BasicSplitPaneDivider *, jint);
+public:
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual jboolean isFocusTraversable();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  static const jint LEFT = 0;
+  static const jint RIGHT = 1;
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) xpoints;
+  JArray< jint > * ypoints;
+  jint direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
new file mode 100644
index 00000000000..418b6dcd845
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DividerLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$DividerLayout : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$DividerLayout(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
new file mode 100644
index 00000000000..902a5725ca3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DragController;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$DragController : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$DragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
+  virtual jboolean isValid();
+  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
+  virtual jint getNeededLocation(jint, jint);
+  virtual void continueDrag(jint, jint);
+  virtual void continueDrag(::java::awt::event::MouseEvent *);
+  virtual void completeDrag(jint, jint);
+  virtual void completeDrag(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jint adjust(jint, jint);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
new file mode 100644
index 00000000000..bafbfee1b78
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$MouseHandler(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) isDragging;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
new file mode 100644
index 00000000000..bc1538536ea
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$OneTouchAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction : public ::java::lang::Object
+{
+
+  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction *);
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
new file mode 100644
index 00000000000..cc1a14915bc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$VerticalDragController;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$VerticalDragController : public ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$VerticalDragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
+  virtual jint getNeededLocation(jint, jint);
+  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jint adjust(jint, jint);
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
new file mode 100644
index 00000000000..a4c51fc5588
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
@@ -0,0 +1,97 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JSplitPane;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DragController;
+            class BasicSplitPaneDivider$MouseHandler;
+            class BasicSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider : public ::java::awt::Container
+{
+
+public:
+  BasicSplitPaneDivider(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void setBasicSplitPaneUI(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneUI * getBasicSplitPaneUI();
+  virtual void setDividerSize(jint);
+  virtual jint getDividerSize();
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual ::javax::swing::border::Border * getBorder();
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void paint(::java::awt::Graphics *);
+public: // actually protected
+  virtual void oneTouchExpandableChanged();
+  virtual ::javax::swing::JButton * createLeftOneTouchButton();
+  virtual ::javax::swing::JButton * createRightOneTouchButton();
+  virtual void prepareForDragging();
+  virtual void dragDividerTo(jint);
+  virtual void finishDraggingTo(jint);
+public: // actually package-private
+  virtual void moveDividerTo(jint);
+  static const jlong serialVersionUID = 1463404307042803342LL;
+public: // actually protected
+  static const jint ONE_TOUCH_SIZE = 6;
+  static const jint ONE_TOUCH_OFFSET = 2;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController * __attribute__((aligned(__alignof__( ::java::awt::Container)))) dragger;
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * splitPaneUI;
+  jint dividerSize;
+  ::java::awt::Component * hiddenDivider;
+  ::javax::swing::JSplitPane * splitPane;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler * mouseHandler;
+  jint orientation;
+  ::javax::swing::JButton * leftButton;
+  ::javax::swing::JButton * rightButton;
+private:
+  ::javax::swing::border::Border * border;
+public: // actually package-private
+  jint currentDividerLocation;
+  jboolean centerOneTouchButtons;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
new file mode 100644
index 00000000000..0d1602b3068
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$1__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$1(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
new file mode 100644
index 00000000000..af65cc5c583
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$2__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$2(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
new file mode 100644
index 00000000000..6dd5e761355
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$3__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$3(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
new file mode 100644
index 00000000000..f66fe4b021d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$4__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$4(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
new file mode 100644
index 00000000000..c9a3e266e06
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$5__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$5(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
new file mode 100644
index 00000000000..9a4facee9cc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$6__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$6(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
new file mode 100644
index 00000000000..d464dded6c9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$7__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$7__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$7 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$7(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
new file mode 100644
index 00000000000..e2248856328
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$8__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$8__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$8;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$8 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$8(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
new file mode 100644
index 00000000000..7f3b3932f36
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
@@ -0,0 +1,88 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *, jint);
+public:
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+public: // actually protected
+  virtual jint getAvailableSize(::java::awt::Dimension *, ::java::awt::Insets *);
+  virtual jint getInitialLocation(::java::awt::Insets *);
+public:
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+public: // actually protected
+  virtual jint getPreferredSizeOfComponent(::java::awt::Component *);
+  virtual jint getSizeOfComponent(::java::awt::Component *);
+  virtual JArray< jint > * getSizes();
+public:
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually protected
+  virtual void resetSizeAt(jint);
+public:
+  virtual void resetToPreferredSizes();
+public: // actually protected
+  virtual void setComponentToSize(::java::awt::Component *, jint, jint, ::java::awt::Insets *, ::java::awt::Dimension *);
+  virtual void setSizes(JArray< jint > *);
+  virtual void updateComponents();
+public: // actually package-private
+  virtual void distributeExtraSpace();
+  virtual jint minimumSizeOfComponent(jint);
+public: // actually protected
+  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
+  JArray< jint > * sizes;
+private:
+  jint axis;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
new file mode 100644
index 00000000000..47f78ce61c4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicVerticalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$BasicVerticalLayoutManager : public ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager
+{
+
+public:
+  BasicSplitPaneUI$BasicVerticalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
new file mode 100644
index 00000000000..a338ae8cfb9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
+
+#pragma interface
+
+#include <java/awt/event/FocusAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
+{
+
+public:
+  BasicSplitPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
new file mode 100644
index 00000000000..439de5c724a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardDownRightHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardDownRightHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardDownRightHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
new file mode 100644
index 00000000000..4b474d91246
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardEndHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardEndHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardEndHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
new file mode 100644
index 00000000000..755d657f059
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardHomeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardHomeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardHomeHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
new file mode 100644
index 00000000000..34e9acdc21c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardResizeToggleHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardResizeToggleHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardResizeToggleHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
new file mode 100644
index 00000000000..ce00ebc9d91
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardUpLeftHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardUpLeftHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardUpLeftHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
new file mode 100644
index 00000000000..87f023b5fed
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$PropertyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$PropertyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$PropertyHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
new file mode 100644
index 00000000000..fdbcb1519f6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
@@ -0,0 +1,149 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SplitPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+      namespace event
+      {
+          class ActionListener;
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JSplitPane;
+        class KeyStroke;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
+{
+
+public:
+  BasicSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardUpLeftListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardDownRightListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardHomeListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardEndListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardResizeToggleListener();
+public:
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+  virtual jboolean isContinuousLayout();
+  virtual void setContinuousLayout(jboolean);
+  virtual jint getLastDragLocation();
+  virtual void setLastDragLocation(jint);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * getDivider();
+public: // actually protected
+  virtual ::java::awt::Component * createDefaultNonContinuousLayoutDivider();
+  virtual void setNonContinuousLayoutDivider(::java::awt::Component *);
+  virtual void setNonContinuousLayoutDivider(::java::awt::Component *, jboolean);
+public:
+  virtual ::java::awt::Component * getNonContinuousLayoutDivider();
+  virtual ::javax::swing::JSplitPane * getSplitPane();
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void resetLayoutManager();
+  virtual void startDragging();
+  virtual void dragDividerTo(jint);
+  virtual void finishDraggingTo(jint);
+  virtual jint getDividerBorderSize();
+private:
+  jint validLocation(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) beginDragDividerLocation;
+  jint dividerSize;
+public: // actually package-private
+  jint lastDragLocation;
+public: // actually protected
+  static jint KEYBOARD_DIVIDER_MOVE_OFFSET;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * divider;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::java::awt::event::ActionListener * keyboardDownRightListener;
+  ::java::awt::event::ActionListener * keyboardEndListener;
+  ::java::awt::event::ActionListener * keyboardHomeListener;
+  ::java::awt::event::ActionListener * keyboardResizeToggleListener;
+  ::java::awt::event::ActionListener * keyboardUpLeftListener;
+  ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager * layoutManager;
+  ::javax::swing::KeyStroke * dividerResizeToggleKey;
+  ::javax::swing::KeyStroke * downKey;
+  ::javax::swing::KeyStroke * endKey;
+  ::javax::swing::KeyStroke * homeKey;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  jboolean draggingHW;
+  static ::java::lang::String * NON_CONTINUOUS_DIVIDER;
+  ::java::awt::Component * nonContinuousLayoutDivider;
+  ::javax::swing::JSplitPane * splitPane;
+public: // actually package-private
+  jboolean dividerLocationSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
new file mode 100644
index 00000000000..4545f105d1d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
+
+#pragma interface
+
+#include <java/awt/event/FocusAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
+{
+
+public:
+  BasicTabbedPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
new file mode 100644
index 00000000000..c36fc50205b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicTabbedPaneUI$MouseHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void redispatchEvent(::java::awt::event::MouseEvent *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
new file mode 100644
index 00000000000..17596c23215
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicTabbedPaneUI$NavigateAction(::java::lang::String *, jint);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
new file mode 100644
index 00000000000..52e7e35cdc7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigatePageDownAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageDownAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$NavigatePageDownAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
new file mode 100644
index 00000000000..c5195afb580
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigatePageUpAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageUpAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$NavigatePageUpAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..09e568fe4de
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
new file mode 100644
index 00000000000..1ee8f725be1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$RequestFocusAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$RequestFocusAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
new file mode 100644
index 00000000000..cbb776a3474
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$RequestFocusForVisibleComponentAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusForVisibleComponentAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$RequestFocusForVisibleComponentAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
new file mode 100644
index 00000000000..895072d427e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicArrowButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton : public ::javax::swing::plaf::basic::BasicArrowButton
+{
+
+public:
+  BasicTabbedPaneUI$ScrollingButton(::javax::swing::plaf::basic::BasicTabbedPaneUI *, jint);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
new file mode 100644
index 00000000000..d896ca00a56
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicPanelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$ScrollingPanel;
+            class BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI : public ::javax::swing::plaf::basic::BasicPanelUI
+{
+
+  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicPanelUI)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
new file mode 100644
index 00000000000..4c1d483448c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingPanel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel : public ::javax::swing::JPanel
+{
+
+  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public:
+  virtual void updateUI();
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+  static ::javax::swing::plaf::basic::BasicTabbedPaneUI * access$1(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
new file mode 100644
index 00000000000..2469bbe27e0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
+
+#pragma interface
+
+#include <javax/swing/JViewport.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingViewport;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport : public ::javax::swing::JViewport
+{
+
+  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
new file mode 100644
index 00000000000..ad26176e00e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$TabSelectionHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
new file mode 100644
index 00000000000..a56abd9f4c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabbedPaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void calculateLayoutInfo();
+public: // actually protected
+  virtual ::java::awt::Dimension * calculateSize(jboolean);
+  virtual void calculateTabRects(jint, jint);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual void normalizeTabRuns(jint, jint, jint, jint);
+  virtual void padSelectedTab(jint, jint);
+  virtual void padTabRun(jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual jint preferredTabAreaHeight(jint, jint);
+  virtual jint preferredTabAreaWidth(jint, jint);
+  virtual void rotateTabRuns(jint, jint);
+public:
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
new file mode 100644
index 00000000000..87642f720ab
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabbedPaneScrollLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
+{
+
+  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual jint preferredTabAreaHeight(jint, jint);
+  virtual jint preferredTabAreaWidth(jint, jint);
+  virtual void calculateTabRects(jint, jint);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually package-private
+  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
new file mode 100644
index 00000000000..a20eedbb569
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
@@ -0,0 +1,223 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Insets;
+        class LayoutManager;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class Icon;
+        class JComponent;
+        class JTabbedPane;
+        class KeyStroke;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingButton;
+            class BasicTabbedPaneUI$ScrollingPanel;
+            class BasicTabbedPaneUI$ScrollingViewport;
+        }
+      }
+      namespace text
+      {
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
+{
+
+public:
+  BasicTabbedPaneUI();
+public: // actually package-private
+  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createIncreaseButton();
+  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createDecreaseButton();
+  virtual ::java::awt::Point * findPointForIndex(jint);
+  virtual void scrollTab(jint, jint);
+  virtual void updateButtons();
+  virtual void updateViewPosition();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void installComponents();
+  virtual void uninstallComponents();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintTabArea(::java::awt::Graphics *, jint, jint);
+  virtual void paintTab(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void layoutLabel(jint, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintIcon(::java::awt::Graphics *, jint, jint, ::javax::swing::Icon *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintText(::java::awt::Graphics *, jint, ::java::awt::Font *, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::java::awt::Rectangle *, jboolean);
+  virtual jint getTabLabelShiftX(jint, jint, jboolean);
+  virtual jint getTabLabelShiftY(jint, jint, jboolean);
+  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintContentBorder(::java::awt::Graphics *, jint, jint);
+  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getTabBounds(jint, ::java::awt::Rectangle *);
+  virtual ::java::awt::Component * getVisibleComponent();
+  virtual void setVisibleComponent(::java::awt::Component *);
+  virtual void assureRectsCreated(jint);
+  virtual void expandTabRunsArray();
+  virtual jint getRunForTab(jint, jint);
+  virtual jint lastTabInRun(jint, jint);
+  virtual jint getTabRunOverlay(jint);
+  virtual jint getTabRunIndent(jint, jint);
+  virtual jboolean shouldPadTabRun(jint, jint);
+  virtual jboolean shouldRotateTabRuns(jint);
+  virtual ::javax::swing::Icon * getIconForTab(jint);
+  virtual ::javax::swing::text::View * getTextViewForTab(jint);
+  virtual jint calculateTabHeight(jint, jint, jint);
+  virtual jint calculateMaxTabHeight(jint);
+  virtual jint calculateTabWidth(jint, jint, ::java::awt::FontMetrics *);
+  virtual jint calculateMaxTabWidth(jint);
+  virtual jint calculateTabAreaHeight(jint, jint, jint);
+  virtual jint calculateTabAreaWidth(jint, jint, jint);
+  virtual ::java::awt::Insets * getTabInsets(jint, jint);
+  virtual ::java::awt::Insets * getSelectedTabPadInsets(jint);
+  virtual ::java::awt::Insets * getTabAreaInsets(jint);
+  virtual ::java::awt::Insets * getContentBorderInsets(jint);
+  virtual ::java::awt::FontMetrics * getFontMetrics();
+  virtual void navigateSelectedTab(jint);
+  virtual void selectNextTabInRun(jint);
+  virtual void selectPreviousTabInRun(jint);
+  virtual void selectNextTab(jint);
+  virtual void selectPreviousTab(jint);
+  virtual void selectAdjacentRunTab(jint, jint, jint);
+  virtual jint getTabRunOffset(jint, jint, jint, jboolean);
+  virtual jint getPreviousTabIndex(jint);
+  virtual jint getNextTabIndex(jint);
+  virtual jint getNextTabIndexInRun(jint, jint);
+  virtual jint getPreviousTabIndexInRun(jint, jint);
+  virtual jint getPreviousTabRun(jint);
+  virtual jint getNextTabRun(jint);
+  static void rotateInsets(::java::awt::Insets *, ::java::awt::Insets *, jint);
+public: // actually package-private
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void setRolloverTab(jint);
+  virtual jint getRolloverTab();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) incrButton;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * decrButton;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport * viewport;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * panel;
+  jint currentScrollLocation;
+  jint currentScrollOffset;
+public: // actually protected
+  ::java::awt::Rectangle * calcRect;
+  JArray< ::java::awt::Rectangle * > * rects;
+  ::java::awt::Insets * contentBorderInsets;
+  ::java::awt::Insets * selectedTabPadInsets;
+  ::java::awt::Insets * tabAreaInsets;
+  ::java::awt::Insets * tabInsets;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * focus;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+  ::java::awt::Color * shadow;
+  jint maxTabHeight;
+  jint maxTabWidth;
+  jint runCount;
+  jint selectedRun;
+  jint tabRunOverlay;
+  jint textIconGap;
+  JArray< jint > * tabRuns;
+public: // actually package-private
+  jboolean tabRunsDirty;
+public: // actually protected
+  ::javax::swing::KeyStroke * downKey;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  ::java::awt::event::FocusListener * focusListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::event::ChangeListener * tabChangeListener;
+  ::javax::swing::JTabbedPane * tabPane;
+public: // actually package-private
+  ::java::awt::LayoutManager * layoutManager;
+  ::java::awt::Rectangle * tabAreaRect;
+  ::java::awt::Rectangle * contentRect;
+private:
+  jint rolloverTab;
+  jboolean tabsOpaque;
+  ::java::awt::Component * visibleComponent;
+  ::java::awt::Color * selectedColor;
+  ::java::awt::Rectangle * tempTextRect;
+  ::java::awt::Rectangle * tempIconRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
new file mode 100644
index 00000000000..76e0a4d77c3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$1__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableHeaderUI$1;
+            class BasicTableHeaderUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTableHeaderUI$1(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
+public:
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
new file mode 100644
index 00000000000..379f3ac293f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableHeaderUI;
+            class BasicTableHeaderUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableHeaderUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableHeaderUI *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void endResizing();
+  virtual void endDragging(::java::awt::event::MouseEvent *);
+  static ::javax::swing::plaf::basic::BasicTableHeaderUI * access$0(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) showingResizeCursor;
+  jint draggingFrom;
+  jint draggingColumnNumber;
+  jint prevPrefWidth;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicTableHeaderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
new file mode 100644
index 00000000000..4a31c132e4a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableHeaderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Cursor;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class JComponent;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTableHeaderUI;
+        }
+      }
+      namespace table
+      {
+          class JTableHeader;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+public:
+  BasicTableHeaderUI();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually package-private
+  static void access$0(::javax::swing::plaf::basic::BasicTableHeaderUI *, ::java::awt::Cursor *);
+  static ::java::awt::Cursor * access$1(::javax::swing::plaf::basic::BasicTableHeaderUI *);
+  static jint COLUMN_BOUNDARY_TOLERANCE;
+public: // actually protected
+  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) header;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::javax::swing::CellRendererPane * rendererPane;
+private:
+  ::javax::swing::border::Border * cellBorder;
+  ::java::awt::Cursor * originalCursor;
+public: // actually package-private
+  ::java::awt::Rectangle * draggingHeaderRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
new file mode 100644
index 00000000000..e7ff31e5d6d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$FocusHandler(::javax::swing::plaf::basic::BasicTableUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+private:
+  void repaintLeadCell();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
new file mode 100644
index 00000000000..f70e6d3c8dc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$KeyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$KeyHandler(::javax::swing::plaf::basic::BasicTableUI *);
+  virtual void keyTyped(::java::awt::event::KeyEvent *);
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
new file mode 100644
index 00000000000..a0fb583afe0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableUI *);
+private:
+  void updateSelection(jboolean);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::java::awt::Point * __attribute__((aligned(__alignof__( ::java::lang::Object)))) begin;
+  ::java::awt::Point * curr;
+  ::javax::swing::plaf::basic::BasicTableUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..e51aad5c042
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *, ::javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
new file mode 100644
index 00000000000..44a245c51cc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$TableAction__
+#define __javax_swing_plaf_basic_BasicTableUI$TableAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class ListSelectionModel;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI$TableAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$TableAction : public ::javax::swing::AbstractAction
+{
+
+  BasicTableUI$TableAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  virtual jint getFirstVisibleColumnIndex(::javax::swing::JTable *);
+  virtual jint getLastVisibleColumnIndex(::javax::swing::JTable *);
+  virtual jint getFirstVisibleRowIndex(::javax::swing::JTable *);
+  virtual jint getLastVisibleRowIndex(::javax::swing::JTable *);
+  virtual void advanceMultipleSelection(::javax::swing::JTable *, ::javax::swing::ListSelectionModel *, jint, jint, ::javax::swing::ListSelectionModel *, jint, jint, jboolean, jboolean);
+  virtual void advanceSingleSelection(::javax::swing::ListSelectionModel *, jint, ::javax::swing::ListSelectionModel *, jint, jboolean);
+  BasicTableUI$TableAction(::javax::swing::plaf::basic::BasicTableUI$TableAction *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$TableAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI.h b/libjava/javax/swing/plaf/basic/BasicTableUI.h
new file mode 100644
index 00000000000..6abd88fcbfe
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI.h
@@ -0,0 +1,112 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI__
+#define __javax_swing_plaf_basic_BasicTableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class KeyListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class CellRendererPane;
+        class JComponent;
+        class JTable;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$TableAction;
+        }
+      }
+      namespace table
+      {
+          class TableCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI : public ::javax::swing::plaf::TableUI
+{
+
+public:
+  BasicTableUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+private:
+  jint getHeight();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void paintCell(::java::awt::Graphics *, jint, jint, ::java::awt::Rectangle *, ::javax::swing::table::TableCellRenderer *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) focusListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::javax::swing::JTable * table;
+public: // actually package-private
+  ::javax::swing::border::Border * cellBorder;
+  ::javax::swing::plaf::basic::BasicTableUI$TableAction * action;
+private:
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
new file mode 100644
index 00000000000..c05b92a0c88
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextAreaUI__
+#define __javax_swing_plaf_basic_BasicTextAreaUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextAreaUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextAreaUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicTextAreaUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextAreaUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
new file mode 100644
index 00000000000..be9a77ca0ed
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextFieldUI__
+#define __javax_swing_plaf_basic_BasicTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextFieldUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextFieldUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  BasicTextFieldUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
new file mode 100644
index 00000000000..62d9deb3f35
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextPaneUI__
+#define __javax_swing_plaf_basic_BasicTextPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicEditorPaneUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextPaneUI : public ::javax::swing::plaf::basic::BasicEditorPaneUI
+{
+
+public:
+  BasicTextPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h b/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
new file mode 100644
index 00000000000..8736761e504
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$1__
+#define __javax_swing_plaf_basic_BasicTextUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTextUI$1(::javax::swing::plaf::basic::BasicTextUI *);
+public:
+  void focusGained(::java::awt::event::FocusEvent *);
+  void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
new file mode 100644
index 00000000000..c89238e10d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
+#define __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultCaret.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$BasicCaret;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$BasicCaret : public ::javax::swing::text::DefaultCaret
+{
+
+public:
+  BasicTextUI$BasicCaret();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
new file mode 100644
index 00000000000..657f780f93d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
+#define __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultHighlighter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$BasicHighlighter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$BasicHighlighter : public ::javax::swing::text::DefaultHighlighter
+{
+
+public:
+  BasicTextUI$BasicHighlighter();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
new file mode 100644
index 00000000000..38e9f49998a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
+#define __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$DocumentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$DocumentHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTextUI$DocumentHandler(::javax::swing::plaf::basic::BasicTextUI *);
+public:
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
new file mode 100644
index 00000000000..05267889e7a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$FocusHandler : public ::java::lang::Object
+{
+
+  BasicTextUI$FocusHandler();
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  BasicTextUI$FocusHandler(::javax::swing::plaf::basic::BasicTextUI$FocusHandler *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
new file mode 100644
index 00000000000..a8ca57be7bd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$Handler__
+#define __javax_swing_plaf_basic_BasicTextUI$Handler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$Handler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$Handler : public ::java::lang::Object
+{
+
+  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
+public: // actually package-private
+  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$Handler *);
+  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$Handler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..bba4ad46b7b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
new file mode 100644
index 00000000000..33044598a04
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$RootView__
+#define __javax_swing_plaf_basic_BasicTextUI$RootView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$RootView;
+        }
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$RootView : public ::javax::swing::text::View
+{
+
+public:
+  BasicTextUI$RootView(::javax::swing::plaf::basic::BasicTextUI *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual void setView(::javax::swing::text::View *);
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual jint getViewCount();
+  virtual ::java::awt::Container * getContainer();
+  virtual void setSize(jfloat, jfloat);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$RootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.h b/libjava/javax/swing/plaf/basic/BasicTextUI.h
new file mode 100644
index 00000000000..f96f1332309
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI.h
@@ -0,0 +1,137 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI__
+#define __javax_swing_plaf_basic_BasicTextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TextUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$Handler;
+            class BasicTextUI$RootView;
+        }
+      }
+      namespace text
+      {
+          class Caret;
+          class EditorKit;
+          class Element;
+          class Highlighter;
+          class JTextComponent;
+          class Keymap;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI : public ::javax::swing::plaf::TextUI
+{
+
+public:
+  BasicTextUI();
+public: // actually protected
+  virtual ::javax::swing::text::Caret * createCaret();
+  virtual ::javax::swing::text::Highlighter * createHighlighter();
+  virtual ::javax::swing::text::JTextComponent * getComponent();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+private:
+  void installFixedDefaults();
+public: // actually protected
+  virtual void installListeners();
+  virtual ::java::lang::String * getKeymapName();
+  virtual ::javax::swing::text::Keymap * createKeymap();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createActionMap();
+  ::javax::swing::InputMap * getInputMap();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+private:
+  void uninstallFixedDefaults();
+public: // actually protected
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::lang::String * getPropertyPrefix() = 0;
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintSafely(::java::awt::Graphics *);
+  virtual void paintBackground(::java::awt::Graphics *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *, jint, jint);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getVisibleEditorRect();
+  virtual void setView(::javax::swing::text::View *);
+  virtual void modelChanged();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  static ::java::awt::event::FocusListener * focusListener;
+  static ::javax::swing::text::EditorKit * kit;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI$Handler * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) handler;
+  ::javax::swing::plaf::basic::BasicTextUI$RootView * rootView;
+  ::javax::swing::text::JTextComponent * textComponent;
+private:
+  ::java::awt::Insets * cachedInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
new file mode 100644
index 00000000000..45a77348c9a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToggleButtonUI__
+#define __javax_swing_plaf_basic_BasicToggleButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToggleButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToggleButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
+{
+
+public:
+  BasicToggleButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
new file mode 100644
index 00000000000..a277f3293bd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
+#define __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSeparator;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolBarSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  BasicToolBarSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSeparator *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+private:
+  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSeparatorUI)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
new file mode 100644
index 00000000000..36511145a51
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DockingListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$DockingListener : public ::java::lang::Object
+{
+
+public:
+  BasicToolBarUI$DockingListener(::javax::swing::plaf::basic::BasicToolBarUI *, ::javax::swing::JToolBar *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isDragging;
+  ::java::awt::Point * origin;
+  ::javax::swing::JToolBar * toolBar;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
new file mode 100644
index 00000000000..0545be03f3f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
+#define __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
+
+#pragma interface
+
+#include <java/awt/Window.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class Insets;
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DragWindow;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$DragWindow : public ::java::awt::Window
+{
+
+public: // actually package-private
+  BasicToolBarUI$DragWindow(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual ::java::awt::Color * getBorderColor();
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Point * getOffset();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void setBorderColor(::java::awt::Color *);
+  virtual void setOffset(::java::awt::Point *);
+  virtual void setOrientation(jint);
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::awt::Window)))) borderColor;
+  ::java::awt::Point * offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
new file mode 100644
index 00000000000..6041d7403fa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
+
+#pragma interface
+
+#include <java/awt/event/WindowAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$FrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$FrameListener : public ::java::awt::event::WindowAdapter
+{
+
+public: // actually protected
+  BasicToolBarUI$FrameListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void windowClosing(::java::awt::event::WindowEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
new file mode 100644
index 00000000000..39dafa84aba
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$PropertyListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$PropertyListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$PropertyListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
new file mode 100644
index 00000000000..ff10a58dd0a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI$ToolBarAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicToolBarUI$ToolBarAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
new file mode 100644
index 00000000000..bcdc5378b59
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI$ToolBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarBorder : public ::java::lang::Object
+{
+
+  BasicToolBarUI$ToolBarBorder();
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  void paintBumps(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *);
+public:
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static const jint offset = 10;
+  static const jint regular = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
new file mode 100644
index 00000000000..0b5d6690dbb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarContListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$ToolBarContListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
new file mode 100644
index 00000000000..b7ee7b89fdc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
+
+#pragma interface
+
+#include <javax/swing/JDialog.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarDialog;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarDialog : public ::javax::swing::JDialog
+{
+
+public:
+  BasicToolBarUI$ToolBarDialog(::javax::swing::plaf::basic::BasicToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::JDialog)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
new file mode 100644
index 00000000000..4b5f7de7228
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarFocusListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarFocusListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$ToolBarFocusListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
new file mode 100644
index 00000000000..3b3c1497818
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
@@ -0,0 +1,170 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI__
+#define __javax_swing_plaf_basic_BasicToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Dimension;
+        class Point;
+        class Window;
+      namespace event
+      {
+          class ContainerListener;
+          class FocusListener;
+          class WindowListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JFrame;
+        class JToolBar;
+        class KeyStroke;
+        class RootPaneContainer;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DragWindow;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI : public ::javax::swing::plaf::ToolBarUI
+{
+
+public:
+  BasicToolBarUI();
+  virtual jboolean canDock(::java::awt::Component *, ::java::awt::Point *);
+private:
+  jint areaOfClick(::java::awt::Component *, ::java::awt::Point *);
+public: // actually protected
+  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
+  virtual ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * createDragWindow(::javax::swing::JToolBar *);
+  virtual ::javax::swing::JFrame * createFloatingFrame(::javax::swing::JToolBar *);
+  virtual ::javax::swing::RootPaneContainer * createFloatingWindow(::javax::swing::JToolBar *);
+  virtual ::java::awt::event::WindowListener * createFrameListener();
+  virtual ::javax::swing::border::Border * createNonRolloverBorder();
+  virtual ::java::beans::PropertyChangeListener * createPropertyListener();
+  virtual ::javax::swing::border::Border * createRolloverBorder();
+  virtual ::java::awt::event::ContainerListener * createToolBarContListener();
+  virtual ::java::awt::event::FocusListener * createToolBarFocusListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void dragTo(::java::awt::Point *, ::java::awt::Point *);
+  virtual void floatAt(::java::awt::Point *, ::java::awt::Point *);
+public:
+  virtual ::java::awt::Color * getDockingColor();
+  virtual ::java::awt::Color * getFloatingColor();
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+  virtual void installNonRolloverBorders(::javax::swing::JComponent *);
+  virtual void installNormalBorders(::javax::swing::JComponent *);
+  virtual void installRolloverBorders(::javax::swing::JComponent *);
+private:
+  void fillHashtable();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual jboolean isFloating();
+  virtual jboolean isRolloverBorders();
+public: // actually protected
+  virtual void navigateFocusedComp(jint);
+  virtual void setBorderToNonRollover(::java::awt::Component *);
+  virtual void setBorderToNormal(::java::awt::Component *);
+  virtual void setBorderToRollover(::java::awt::Component *);
+public:
+  virtual void setDockingColor(::java::awt::Color *);
+  virtual void setFloating(jboolean, ::java::awt::Point *);
+  virtual void setFloatingColor(::java::awt::Color *);
+  virtual void setFloatingLocation(jint, jint);
+  virtual void setOrientation(jint);
+  virtual void setRolloverBorders(jboolean);
+public: // actually protected
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  static ::javax::swing::JFrame * owner;
+private:
+  static ::javax::swing::border::Border * nonRolloverBorder;
+  static ::javax::swing::border::Border * rolloverBorder;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) constraintBeforeFloating;
+public: // actually package-private
+  jint lastGoodOrientation;
+public: // actually protected
+  ::java::awt::Color * dockingBorderColor;
+  ::java::awt::Color * dockingColor;
+  ::javax::swing::event::MouseInputListener * dockingListener;
+  ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * dragWindow;
+  ::java::awt::Color * floatingBorderColor;
+  ::java::awt::Color * floatingColor;
+  jint focusedCompIndex;
+  ::java::beans::PropertyChangeListener * propertyListener;
+  ::javax::swing::JToolBar * toolBar;
+  ::java::awt::event::ContainerListener * toolBarContListener;
+  ::java::awt::event::FocusListener * toolBarFocusListener;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  ::javax::swing::KeyStroke * downKey;
+private:
+  ::java::awt::Window * floatFrame;
+public: // actually package-private
+  ::java::awt::Container * origParent;
+  ::java::util::Hashtable * borders;
+private:
+  ::java::awt::event::WindowListener * windowListener;
+public: // actually package-private
+  ::java::awt::Dimension * cachedBounds;
+  jint cachedOrientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..9bc19d1ba82
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolTipUI;
+            class BasicToolTipUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *, ::javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicToolTipUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
new file mode 100644
index 00000000000..a204e00e1e1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolTipUI__
+#define __javax_swing_plaf_basic_BasicToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolTipUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolTipUI : public ::javax::swing::plaf::ToolTipUI
+{
+
+public:
+  BasicToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JComponent *);
+  virtual void installListeners(::javax::swing::JComponent *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JComponent *);
+  virtual void uninstallListeners(::javax::swing::JComponent *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::basic::BasicToolTipUI * shared;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) text;
+  ::java::beans::PropertyChangeListener * propertyChangeHandler;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolTipUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
new file mode 100644
index 00000000000..944d09abf9d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$1__
+#define __javax_swing_plaf_basic_BasicTreeUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$1 : public ::java::lang::Object
+{
+
+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);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
new file mode 100644
index 00000000000..d71232d451f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$2__
+#define __javax_swing_plaf_basic_BasicTreeUI$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTreeUI$2(::javax::swing::plaf::basic::BasicTreeUI *);
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
new file mode 100644
index 00000000000..07bc329e3c3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$CellEditorHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$CellEditorHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$CellEditorHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
+  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
new file mode 100644
index 00000000000..ec6d8185735
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollPane;
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+public:
+  BasicTreeUI$ComponentHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+public: // actually protected
+  virtual void startTimer();
+  virtual ::javax::swing::JScrollPane * getScrollPane();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) timer;
+  ::javax::swing::JScrollBar * scrollBar;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
new file mode 100644
index 00000000000..232e989a2e9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$FocusHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  virtual void repaintLeadRow();
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
new file mode 100644
index 00000000000..2be990a8ea5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$KeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicTreeUI$KeyHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void keyTyped(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  virtual jboolean checkMatch(jint, jchar);
+public:
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually protected
+  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) repeatKeyAction;
+  jboolean isKeyDown;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
new file mode 100644
index 00000000000..2a0893ba233
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicTreeUI$MouseHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  void handleEvent(::java::awt::event::MouseEvent *);
+  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) selectedOnPress;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
new file mode 100644
index 00000000000..574d8b56a50
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTreeUI *, ::java::awt::Component *, ::java::awt::Component *, ::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually protected
+  virtual void removeFromSource();
+private:
+  void dispatch(::java::awt::event::MouseEvent *);
+public: // actually protected
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
+  ::java::awt::Component * destination;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
new file mode 100644
index 00000000000..352a37067cd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
+
+#pragma interface
+
+#include <javax/swing/tree/AbstractLayoutCache$NodeDimensions.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$NodeDimensionsHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$NodeDimensionsHandler : public ::javax::swing::tree::AbstractLayoutCache$NodeDimensions
+{
+
+public:
+  BasicTreeUI$NodeDimensionsHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
+public: // actually protected
+  virtual jint getRowX(jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache$NodeDimensions)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
new file mode 100644
index 00000000000..54386de9cbd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
new file mode 100644
index 00000000000..52b52d1c375
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$SelectionModelPropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$SelectionModelPropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$SelectionModelPropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
new file mode 100644
index 00000000000..b64ba698eda
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeCancelEditingAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeCancelEditingAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeCancelEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
new file mode 100644
index 00000000000..52ba7c8bb1f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeExpansionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeExpansionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeExpansionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
+  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
new file mode 100644
index 00000000000..1b25c11646c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeHomeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeHomeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeHomeAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
new file mode 100644
index 00000000000..03ed852179e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeIncrementAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeIncrementAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeIncrementAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
new file mode 100644
index 00000000000..9ea52685087
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeModelHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeModelHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeModelHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
new file mode 100644
index 00000000000..5cb1725d4fd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreePageAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreePageAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreePageAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
new file mode 100644
index 00000000000..73ff33b1c15
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeSelectionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
new file mode 100644
index 00000000000..fa01f97ddbf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeStartEditingAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeStartEditingAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeStartEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
new file mode 100644
index 00000000000..59b5c5e2ea6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeToggleAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeToggleAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeToggleAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
new file mode 100644
index 00000000000..617dbd65299
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeTraverseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeTraverseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeTraverseAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.h b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
new file mode 100644
index 00000000000..134cb2f3df8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
@@ -0,0 +1,280 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI__
+#define __javax_swing_plaf_basic_BasicTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TreeUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+          class FocusListener;
+          class KeyListener;
+          class MouseEvent;
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class CellRendererPane;
+        class Icon;
+        class JComponent;
+        class JTree;
+      namespace event
+      {
+          class CellEditorListener;
+          class TreeExpansionListener;
+          class TreeModelListener;
+          class TreeSelectionListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class AbstractLayoutCache;
+          class AbstractLayoutCache$NodeDimensions;
+          class TreeCellEditor;
+          class TreeCellRenderer;
+          class TreeModel;
+          class TreePath;
+          class TreeSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI : public ::javax::swing::plaf::TreeUI
+{
+
+public:
+  BasicTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Color * getHashColor();
+  virtual void setHashColor(::java::awt::Color *);
+public:
+  virtual void setLeftChildIndent(jint);
+  virtual jint getLeftChildIndent();
+  virtual void setRightChildIndent(jint);
+  virtual jint getRightChildIndent();
+  virtual void setExpandedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getExpandedIcon();
+  virtual void setCollapsedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getCollapsedIcon();
+public: // actually protected
+  virtual void setLargeModel(jboolean);
+  virtual jboolean isLargeModel();
+  virtual void setRowHeight(jint);
+  virtual jint getRowHeight();
+  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
+  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual ::javax::swing::tree::TreeModel * getModel();
+  virtual void setRootVisible(jboolean);
+  virtual jboolean isRootVisible();
+  virtual void setShowsRootHandles(jboolean);
+  virtual jboolean getShowsRootHandles();
+  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
+  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
+  virtual void setEditable(jboolean);
+  virtual jboolean isEditable();
+  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
+  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
+public:
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+public: // actually package-private
+  virtual jint getMaxHeight(::javax::swing::JTree *);
+  virtual ::javax::swing::Icon * getNodeIcon(::javax::swing::tree::TreePath *);
+public:
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual jint getRowCount(::javax::swing::JTree *);
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
+  virtual jboolean isEditing(::javax::swing::JTree *);
+  virtual jboolean stopEditing(::javax::swing::JTree *);
+  virtual void cancelEditing(::javax::swing::JTree *);
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
+public: // actually protected
+  virtual void prepareForUIInstall();
+  virtual void completeUIInstall();
+  virtual void completeUIUninstall();
+  virtual void installComponents();
+  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * createNodeDimensions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::java::beans::PropertyChangeListener * createSelectionModelPropertyChangeListener();
+  virtual ::javax::swing::event::TreeSelectionListener * createTreeSelectionListener();
+  virtual ::javax::swing::event::CellEditorListener * createCellEditorListener();
+  virtual ::java::awt::event::ComponentListener * createComponentListener();
+  virtual ::javax::swing::event::TreeExpansionListener * createTreeExpansionListener();
+  virtual ::javax::swing::tree::AbstractLayoutCache * createLayoutCache();
+  virtual ::javax::swing::CellRendererPane * createCellRendererPane();
+  virtual ::javax::swing::tree::TreeCellEditor * createDefaultCellEditor();
+  virtual ::javax::swing::tree::TreeCellRenderer * createDefaultCellRenderer();
+  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallComponents();
+  virtual jint getVerticalLegBuffer();
+  virtual jint getHorizontalLegBuffer();
+  virtual void updateLayoutCacheExpandedNodes();
+  virtual void updateExpandedDescendants(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getLastChildPath(::javax::swing::tree::TreePath *);
+  virtual void updateDepthOffset();
+  virtual void updateCellEditor();
+  virtual void updateRenderer();
+  virtual void configureLayoutCache();
+  virtual void updateSize();
+  virtual void updateCachedPreferredSize();
+  virtual void pathWasExpanded(::javax::swing::tree::TreePath *);
+  virtual void pathWasCollapsed(::javax::swing::tree::TreePath *);
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+  jint convertModifiers(jint);
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  jboolean isLastChild(::javax::swing::tree::TreePath *);
+public: // actually protected
+  virtual void ensureRowsAreVisible(jint, jint);
+public:
+  virtual void setPreferredMinSize(::java::awt::Dimension *);
+  virtual ::java::awt::Dimension * getPreferredMinSize();
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *, jboolean);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void completeEditing();
+  virtual void completeEditing(jboolean, jboolean, jboolean);
+  virtual jboolean startEditing(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
+private:
+  void editorRequestFocus(::java::awt::Component *);
+public: // actually protected
+  virtual void checkForClickInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
+  virtual jboolean isLocationInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
+  virtual void handleExpandControlClick(::javax::swing::tree::TreePath *, jint, jint);
+  virtual void toggleExpandState(::javax::swing::tree::TreePath *);
+  virtual jboolean isToggleSelectionEvent(::java::awt::event::MouseEvent *);
+  virtual jboolean isMultiSelectEvent(::java::awt::event::MouseEvent *);
+  virtual jboolean isToggleEvent(::java::awt::event::MouseEvent *);
+  virtual void selectPathForEvent(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
+  virtual jboolean isLeaf(jint);
+public: // actually package-private
+  virtual jboolean hasControlIcons();
+  virtual ::javax::swing::Icon * getCurrentControlIcon(::javax::swing::tree::TreePath *);
+  virtual ::java::lang::Object * getParent(::java::lang::Object *, ::java::lang::Object *);
+private:
+  ::java::lang::Object * findNode(::java::lang::Object *, ::java::lang::Object *);
+public: // actually package-private
+  virtual void selectPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual JArray< ::java::lang::Object * > * getPathToRoot(::java::lang::Object *, jint);
+public: // actually protected
+  virtual void paintVerticalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
+  virtual void paintHorizontalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
+  virtual void drawCentered(::java::awt::Component *, ::java::awt::Graphics *, ::javax::swing::Icon *, jint, jint);
+  virtual void drawDashedHorizontalLine(::java::awt::Graphics *, jint, jint, jint);
+  virtual void drawDashedVerticalLine(::java::awt::Graphics *, jint, jint, jint);
+  virtual void paintExpandControl(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
+  virtual void paintRow(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void prepareForUIUninstall();
+  virtual jboolean shouldPaintExpandControl(::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual jint getRowX(jint, jint);
+public: // actually package-private
+  static jint WAIT_TILL_EDITING;
+public: // actually protected
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) collapsedIcon;
+  ::javax::swing::Icon * expandedIcon;
+  jint leftChildIndent;
+  jint rightChildIndent;
+  jint totalChildIndent;
+  jint lastSelectedRow;
+  ::javax::swing::JTree * tree;
+  ::javax::swing::tree::TreeCellRenderer * currentCellRenderer;
+  jboolean createdRenderer;
+  ::javax::swing::tree::TreeCellEditor * cellEditor;
+  jboolean createdCellEditor;
+  jboolean stopEditingInCompleteEditing;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::java::awt::Dimension * preferredSize;
+  ::java::awt::Dimension * preferredMinSize;
+  jboolean validCachedPreferredSize;
+  ::javax::swing::tree::AbstractLayoutCache * treeState;
+  ::java::util::Hashtable * drawingCache;
+  jboolean largeModel;
+  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * nodeDimensions;
+  ::javax::swing::tree::TreeModel * treeModel;
+  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
+  jint depthOffset;
+  ::java::awt::Component * editingComponent;
+  ::javax::swing::tree::TreePath * editingPath;
+  jint editingRow;
+  jboolean editorHasDifferentSize;
+public: // actually package-private
+  jboolean isEditing__;
+  ::javax::swing::tree::TreePath * currentVisiblePath;
+  jint gap;
+  jint maxHeight;
+  ::java::awt::Color * hashColor;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::javax::swing::event::TreeSelectionListener * treeSelectionListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::java::beans::PropertyChangeListener * selectionModelPropertyChangeListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::javax::swing::event::CellEditorListener * cellEditorListener;
+  ::javax::swing::event::TreeExpansionListener * treeExpansionListener;
+  ::javax::swing::event::TreeModelListener * treeModelListener;
+  static ::javax::swing::Icon * nullIcon;
+  static ::java::awt::event::MouseEvent * EDIT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicViewportUI.h b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
new file mode 100644
index 00000000000..f657f7dc098
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicViewportUI__
+#define __javax_swing_plaf_basic_BasicViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ViewportUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicViewportUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicViewportUI : public ::javax::swing::plaf::ViewportUI
+{
+
+public:
+  BasicViewportUI();
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JComponent *);
+  virtual void uninstallDefaults(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/ComboPopup.h b/libjava/javax/swing/plaf/basic/ComboPopup.h
new file mode 100644
index 00000000000..9f01bedb340
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/ComboPopup.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_ComboPopup__
+#define __javax_swing_plaf_basic_ComboPopup__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyListener;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class ComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::ComboPopup : public ::java::lang::Object
+{
+
+public:
+  virtual void show() = 0;
+  virtual void hide() = 0;
+  virtual jboolean isVisible() = 0;
+  virtual ::javax::swing::JList * getList() = 0;
+  virtual ::java::awt::event::MouseListener * getMouseListener() = 0;
+  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener() = 0;
+  virtual ::java::awt::event::KeyListener * getKeyListener() = 0;
+  virtual void uninstallingUI() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_basic_ComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
new file mode 100644
index 00000000000..15b06f2a807
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_DefaultMenuLayout__
+#define __javax_swing_plaf_basic_DefaultMenuLayout__
+
+#pragma interface
+
+#include <javax/swing/BoxLayout.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class DefaultMenuLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::DefaultMenuLayout : public ::javax::swing::BoxLayout
+{
+
+public:
+  DefaultMenuLayout(::java::awt::Container *, jint);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_DefaultMenuLayout__
diff --git a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
new file mode 100644
index 00000000000..7db5a2f3b50
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_SharedUIDefaults__
+#define __javax_swing_plaf_basic_SharedUIDefaults__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class SharedUIDefaults;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::SharedUIDefaults : public ::java::lang::Object
+{
+
+public:
+  SharedUIDefaults();
+public: // actually package-private
+  static ::java::lang::Object * get(::java::lang::String *);
+  static ::java::awt::Color * getColor(::java::lang::String *);
+private:
+  static ::java::util::HashMap * sharedDefaults;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_SharedUIDefaults__
diff --git a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
new file mode 100644
index 00000000000..8ce9a8c1b5a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_DefaultMetalTheme__
+#define __javax_swing_plaf_metal_DefaultMetalTheme__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalTheme.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class DefaultMetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::DefaultMetalTheme : public ::javax::swing::plaf::metal::MetalTheme
+{
+
+public:
+  DefaultMetalTheme();
+  virtual ::java::lang::String * getName();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
+public:
+  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
+private:
+  ::javax::swing::plaf::FontUIResource * getFont(jint);
+  jboolean isBoldMetal();
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
+  static ::javax::swing::plaf::FontUIResource * SUB_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * SYSTEM_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * USER_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * WINDOW_TITLE_FONT;
+  static ::javax::swing::plaf::FontUIResource * PLAIN_CONTROL_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * BOLD_CONTROL_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * PLAIN_MENU_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * BOLD_MENU_TEXT_FONT;
+public: // actually package-private
+  static const jint CONTROL_TEXT_FONT = 1;
+  static const jint MENU_TEXT_FONT = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_DefaultMetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
new file mode 100644
index 00000000000..23e18daddbb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void paintDefaultButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  void paintOceanButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
new file mode 100644
index 00000000000..ba3739cf631
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
+#define __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$DesktopIconBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$DesktopIconBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$DesktopIconBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
new file mode 100644
index 00000000000..be51edc5bf1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
+#define __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$Flush3DBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$Flush3DBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$Flush3DBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
new file mode 100644
index 00000000000..e85132faef8
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
+#define __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$InternalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$InternalFrameBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
new file mode 100644
index 00000000000..b42e516e8fb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
+#define __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$MenuBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$MenuBarBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
new file mode 100644
index 00000000000..b339b8758bb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
+#define __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$MenuItemBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$MenuItemBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$MenuItemBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
new file mode 100644
index 00000000000..1a04e67ec7e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
+#define __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$OptionDialogBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$OptionDialogBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$OptionDialogBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
new file mode 100644
index 00000000000..853bd4cef7c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
+#define __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$PaletteBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$PaletteBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$PaletteBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
new file mode 100644
index 00000000000..cc66966b672
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
+#define __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$PopupMenuBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$PopupMenuBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$PopupMenuBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
new file mode 100644
index 00000000000..e34c0cf372e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$RolloverButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$RolloverButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
+{
+
+public:
+  MetalBorders$RolloverButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
new file mode 100644
index 00000000000..78e6c4f00c1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
+#define __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$RolloverMarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$RolloverMarginBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$RolloverMarginBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
new file mode 100644
index 00000000000..d6baf243933
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ScrollPaneBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ScrollPaneBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ScrollPaneBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * insets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
new file mode 100644
index 00000000000..94874119183
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
+#define __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$TableHeaderBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$TableHeaderBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$TableHeaderBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually protected
+  ::java::awt::Insets * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) editorBorderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
new file mode 100644
index 00000000000..de1e4e7d864
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
+#define __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$TextFieldBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$TextFieldBorder : public ::javax::swing::plaf::metal::MetalBorders$Flush3DBorder
+{
+
+public:
+  MetalBorders$TextFieldBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
new file mode 100644
index 00000000000..6d9f3de5c03
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ToggleButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ToggleButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
+{
+
+public:
+  MetalBorders$ToggleButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
new file mode 100644
index 00000000000..da97e79e506
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ToolBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ToolBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ToolBarBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders.h b/libjava/javax/swing/plaf/metal/MetalBorders.h
new file mode 100644
index 00000000000..63101bfb525
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders__
+#define __javax_swing_plaf_metal_MetalBorders__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MarginBorder;
+        }
+        namespace metal
+        {
+            class MetalBorders;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders : public ::java::lang::Object
+{
+
+public:
+  MetalBorders();
+  static ::javax::swing::border::Border * getButtonBorder();
+  static ::javax::swing::border::Border * getToggleButtonBorder();
+  static ::javax::swing::border::Border * getDesktopIconBorder();
+  static ::javax::swing::border::Border * getTextFieldBorder();
+  static ::javax::swing::border::Border * getTextBorder();
+public: // actually package-private
+  static ::javax::swing::border::Border * getToolbarButtonBorder();
+  static ::javax::swing::border::Border * getMarginBorder();
+  static ::javax::swing::border::Border * getRolloverBorder();
+private:
+  static ::javax::swing::border::Border * buttonBorder;
+  static ::javax::swing::border::Border * toggleButtonBorder;
+  static ::javax::swing::border::Border * desktopIconBorder;
+  static ::javax::swing::border::Border * toolbarButtonBorder;
+  static ::javax::swing::border::Border * textFieldBorder;
+  static ::javax::swing::border::Border * textBorder;
+  static ::javax::swing::border::Border * rolloverBorder;
+  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * marginBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonListener.h b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
new file mode 100644
index 00000000000..0beeef1718a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalButtonListener__
+#define __javax_swing_plaf_metal_MetalButtonListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonListener.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalButtonListener : public ::javax::swing::plaf::basic::BasicButtonListener
+{
+
+public:
+  MetalButtonListener(::javax::swing::AbstractButton *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalButtonListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonUI.h b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
new file mode 100644
index 00000000000..d2e6ced26a1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalButtonUI__
+#define __javax_swing_plaf_metal_MetalButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalButtonUI();
+public: // actually protected
+  virtual ::java::awt::Color * getFocusColor();
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+public:
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  jboolean isToolbarButton(::java::awt::Component *);
+  jboolean isDrawingGradient(::java::lang::String *);
+  static ::javax::swing::plaf::metal::MetalButtonUI * sharedUI;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
new file mode 100644
index 00000000000..b30ae97ba21
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalCheckBoxIcon__
+#define __javax_swing_plaf_metal_MetalCheckBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ButtonBorder;
+            class MetalCheckBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalCheckBoxIcon : public ::java::lang::Object
+{
+
+public:
+  MetalCheckBoxIcon();
+public: // actually protected
+  virtual void drawCheck(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getControlSize();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalBorders$ButtonBorder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) border;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalCheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
new file mode 100644
index 00000000000..fff6cd27ef1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalCheckBoxUI__
+#define __javax_swing_plaf_metal_MetalCheckBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalRadioButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalCheckBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalCheckBoxUI : public ::javax::swing::plaf::metal::MetalRadioButtonUI
+{
+
+public:
+  MetalCheckBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getPropertyPrefix();
+private:
+  static ::javax::swing::plaf::metal::MetalCheckBoxUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
new file mode 100644
index 00000000000..000e755fbe0
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxButton__
+#define __javax_swing_plaf_metal_MetalComboBoxButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class Icon;
+        class JComboBox;
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxButton : public ::javax::swing::JButton
+{
+
+public:
+  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
+  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, jboolean, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
+  virtual ::javax::swing::JComboBox * getComboBox();
+  virtual void setComboBox(::javax::swing::JComboBox *);
+  virtual ::javax::swing::Icon * getComboIcon();
+  virtual void setComboIcon(::javax::swing::Icon *);
+  virtual jboolean isIconOnly();
+  virtual void setIconOnly(jboolean);
+  virtual jboolean isFocusTraversable();
+  virtual void setEnabled(jboolean);
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) comboBox;
+  ::javax::swing::JList * listBox;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::javax::swing::Icon * comboIcon;
+  jboolean iconOnly;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
new file mode 100644
index 00000000000..501e1386457
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor;
+            class MetalComboBoxEditor$EditorTextField;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$EditorTextField : public ::javax::swing::JTextField
+{
+
+public: // actually package-private
+  MetalComboBoxEditor$EditorTextField(::javax::swing::plaf::metal::MetalComboBoxEditor *, ::java::lang::String *, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxEditor * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
new file mode 100644
index 00000000000..4f8166c503b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor$MetalComboBoxEditorBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$MetalComboBoxEditorBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalComboBoxEditor$MetalComboBoxEditorBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
new file mode 100644
index 00000000000..edf8097d42d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalComboBoxEditor.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$UIResource : public ::javax::swing::plaf::metal::MetalComboBoxEditor
+{
+
+public:
+  MetalComboBoxEditor$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
new file mode 100644
index 00000000000..89d3edfe4af
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor : public ::javax::swing::plaf::basic::BasicComboBoxEditor
+{
+
+public:
+  MetalComboBoxEditor();
+public: // actually protected
+  static ::java::awt::Insets * editorBorderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
new file mode 100644
index 00000000000..a51d9aa3cf4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxIcon__
+#define __javax_swing_plaf_metal_MetalComboBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxIcon : public ::java::lang::Object
+{
+
+public:
+  MetalComboBoxIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
new file mode 100644
index 00000000000..d2a909c445d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager : public ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager
+{
+
+public:
+  MetalComboBoxUI$MetalComboBoxLayoutManager(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual void superLayout(::java::awt::Container *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
new file mode 100644
index 00000000000..ac9789ff0d2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboPopup.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComboBox;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboPopup : public ::javax::swing::plaf::basic::BasicComboPopup
+{
+
+public:
+  MetalComboBoxUI$MetalComboPopup(::javax::swing::plaf::metal::MetalComboBoxUI *, ::javax::swing::JComboBox *);
+  virtual void delegateFocus(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboPopup)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
new file mode 100644
index 00000000000..fee1da1a459
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalPropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalPropertyChangeListener : public ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler
+{
+
+public:
+  MetalComboBoxUI$MetalPropertyChangeListener(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
new file mode 100644
index 00000000000..047d1442b05
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI__
+#define __javax_swing_plaf_metal_MetalComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxEditor;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JList;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class ComboPopup;
+        }
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI : public ::javax::swing::plaf::basic::BasicComboBoxUI
+{
+
+public:
+  MetalComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::ComboBoxEditor * createEditor();
+  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
+  virtual ::javax::swing::JButton * createArrowButton();
+public:
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void editablePropertyChanged(::java::beans::PropertyChangeEvent *);
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void removeListeners();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void configureEditor();
+  virtual void unconfigureEditor();
+  virtual void layoutComboBox(::java::awt::Container *, ::javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager *);
+public: // actually package-private
+  static ::javax::swing::JButton * access$0(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  static ::javax::swing::JComboBox * access$1(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  static ::javax::swing::JList * access$2(::javax::swing::plaf::metal::MetalComboBoxUI *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
new file mode 100644
index 00000000000..1b1de7b5776
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalDesktopIconUI__
+#define __javax_swing_plaf_metal_MetalDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicDesktopIconUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalDesktopIconUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalDesktopIconUI : public ::javax::swing::plaf::basic::BasicDesktopIconUI
+{
+
+public:
+  MetalDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
new file mode 100644
index 00000000000..9900aed3910
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$ButtonLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$ButtonLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$ButtonLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  static const jint GAP = 4;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
new file mode 100644
index 00000000000..92fac4ca2f9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DetailViewActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DetailViewActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$DetailViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
new file mode 100644
index 00000000000..da666e12989
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  MetalFileChooserUI$DirectoryComboBoxAction(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
new file mode 100644
index 00000000000..27a72e053e6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  MetalFileChooserUI$DirectoryComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+  virtual jint getDepth(jint);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual void setSelectedItem(::java::lang::Object *);
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) items;
+  jint selectedIndex;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
new file mode 100644
index 00000000000..6e88691ae5b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxRenderer;
+            class MetalFileChooserUI$IndentIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public:
+  MetalFileChooserUI$DirectoryComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JFileChooser *);
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+private:
+  ::javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) indentIcon;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
new file mode 100644
index 00000000000..235c7c968c4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FileRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FileRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public: // actually protected
+  MetalFileChooserUI$FileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
new file mode 100644
index 00000000000..48ce51fe151
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace filechooser
+      {
+          class FileFilter;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FilterComboBoxModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel : public ::javax::swing::AbstractListModel
+{
+
+public: // actually protected
+  MetalFileChooserUI$FilterComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void setSelectedItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+public: // actually protected
+  JArray< ::javax::swing::filechooser::FileFilter * > * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) filters;
+private:
+  ::java::lang::Object * selected;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
new file mode 100644
index 00000000000..60260fa49ce
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FilterComboBoxRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public:
+  MetalFileChooserUI$FilterComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
new file mode 100644
index 00000000000..c1b25f6718c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$IndentIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$IndentIcon(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual void setDepth(jint);
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  static const jint INDENT = 10;
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) icon;
+  jint depth;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
new file mode 100644
index 00000000000..79b8f71ef31
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$ListViewActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$ListViewActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$ListViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
new file mode 100644
index 00000000000..7c0368ca90b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$MetalFileChooserPropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserPropertyChangeListener : public ::java::lang::Object
+{
+
+public:
+  MetalFileChooserUI$MetalFileChooserPropertyChangeListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
new file mode 100644
index 00000000000..460f121b92e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$MetalFileChooserSelectionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserSelectionListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  MetalFileChooserUI$MetalFileChooserSelectionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
new file mode 100644
index 00000000000..02fe27e49dd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI$SingleClickListener;
+            class MetalFileChooserUI$SingleClickListener$EditingActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener$EditingActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$SingleClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
new file mode 100644
index 00000000000..66c7b0d10f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JList;
+        class JTextField;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$SingleClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  MetalFileChooserUI$SingleClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JList *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void editFile(jint);
+  virtual void completeEditing();
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) list;
+  ::java::io::File * editFile__;
+  ::javax::swing::JFileChooser * fc;
+  ::java::lang::Object * lastSelected;
+  ::javax::swing::JTextField * editField;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
new file mode 100644
index 00000000000..bacd2d07e89
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI$TableClickListener;
+            class MetalFileChooserUI$TableClickListener$EditingActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener$EditingActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$TableClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
new file mode 100644
index 00000000000..2e536e45637
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JTable;
+        class JTextField;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$TableClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  MetalFileChooserUI$TableClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JTable *, ::javax::swing::JFileChooser *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void editFile(jint);
+  virtual void completeEditing();
+public:
+  virtual void closeDialog();
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) table;
+  ::javax::swing::JFileChooser * fc;
+  ::java::lang::Object * lastSelected;
+  ::java::io::File * editFile__;
+  ::javax::swing::JTextField * editField;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
new file mode 100644
index 00000000000..e5b5029f733
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$TableFileRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableFileRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  MetalFileChooserUI$TableFileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
new file mode 100644
index 00000000000..64f4be6c619
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$VerticalMidLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$VerticalMidLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$VerticalMidLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
new file mode 100644
index 00000000000..cf8ceae94e4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
@@ -0,0 +1,159 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI__
+#define __javax_swing_plaf_metal_MetalFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicFileChooserUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JFileChooser;
+        class JLabel;
+        class JList;
+        class JPanel;
+        class JScrollPane;
+        class JTable;
+        class JTextField;
+      namespace event
+      {
+          class ListSelectionEvent;
+          class ListSelectionListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxModel;
+            class MetalFileChooserUI$DirectoryComboBoxRenderer;
+            class MetalFileChooserUI$FilterComboBoxModel;
+            class MetalFileChooserUI$FilterComboBoxRenderer;
+            class MetalFileChooserUI$SingleClickListener;
+            class MetalFileChooserUI$TableClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI : public ::javax::swing::plaf::basic::BasicFileChooserUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalFileChooserUI(::javax::swing::JFileChooser *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void installComponents(::javax::swing::JFileChooser *);
+  virtual void uninstallComponents(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::javax::swing::JPanel * getButtonPanel();
+  virtual ::javax::swing::JPanel * getBottomPanel();
+  virtual void installStrings(::javax::swing::JFileChooser *);
+  virtual void installListeners(::javax::swing::JFileChooser *);
+  virtual void uninstallListeners(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+  virtual ::javax::swing::JPanel * createList(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::JPanel * createDetailsView(::javax::swing::JFileChooser *);
+public: // actually package-private
+  virtual ::javax::swing::JPanel * updateTable();
+private:
+  ::java::lang::String * formatSize(jlong);
+public:
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * createDirectoryComboBoxModel(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer * createDirectoryComboBoxRenderer(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * createFilterComboBoxModel();
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer * createFilterComboBoxRenderer();
+  virtual void addControlButtons();
+  virtual void removeControlButtons();
+public:
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getFileName();
+  virtual void setFileName(::java::lang::String *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually protected
+  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
+public: // actually package-private
+  static void access$0(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::lang::String *);
+  static ::java::lang::String * access$1(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$2(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$3(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$4(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$5(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static void access$6(::javax::swing::plaf::metal::MetalFileChooserUI *, jboolean);
+  static void access$7(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::io::File *);
+  static ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * access$8(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JButton * access$9(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JPanel * access$10(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JPanel * access$11(::javax::swing::plaf::metal::MetalFileChooserUI *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicFileChooserUI)))) directoryLabel;
+  ::javax::swing::JComboBox * directoryComboBox;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * directoryModel;
+private:
+  ::java::lang::String * fileLabel;
+  ::javax::swing::JTextField * fileTextField;
+  ::java::lang::String * filterLabel;
+  ::javax::swing::JPanel * topPanel;
+  ::javax::swing::JPanel * controls;
+  ::javax::swing::JPanel * bottomPanel;
+  ::javax::swing::JPanel * buttonPanel;
+  ::javax::swing::JButton * approveButton;
+public: // actually package-private
+  ::javax::swing::JList * fileList;
+  ::javax::swing::JTable * fileTable;
+  ::javax::swing::JPanel * fileListPanel;
+  ::javax::swing::JPanel * fileTablePanel;
+private:
+  ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * filterModel;
+  ::javax::swing::ActionMap * actionMap;
+public: // actually package-private
+  jboolean listView;
+  jboolean startEditing;
+  ::javax::swing::JScrollPane * scrollPane;
+  ::java::lang::String * save;
+  ::java::lang::String * look;
+  ::javax::swing::JLabel * dirLabel;
+  ::javax::swing::event::ListSelectionListener * listSelList;
+  ::java::awt::event::MouseListener * doubleClickList;
+  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * singleClickList;
+  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * tableClickList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
new file mode 100644
index 00000000000..e57034fa61a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$1__
+#define __javax_swing_plaf_metal_MetalIconFactory$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$1();
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
new file mode 100644
index 00000000000..3f359f80e6a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$2__
+#define __javax_swing_plaf_metal_MetalIconFactory$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$2();
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$2__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
new file mode 100644
index 00000000000..f86819ac917
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$3__
+#define __javax_swing_plaf_metal_MetalIconFactory$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$3();
+public:
+  jint getIconHeight();
+  jint getIconWidth();
+  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$3__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
new file mode 100644
index 00000000000..0625a9b249e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$CheckBoxMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$CheckBoxMenuItemIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
new file mode 100644
index 00000000000..67b065fb412
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserDetailViewIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserDetailViewIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserDetailViewIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
new file mode 100644
index 00000000000..5395249ab7b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserHomeFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserHomeFolderIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserHomeFolderIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
new file mode 100644
index 00000000000..d1e479a83fc
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserListViewIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserListViewIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserListViewIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
new file mode 100644
index 00000000000..f34373e9565
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserNewFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserNewFolderIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
new file mode 100644
index 00000000000..ad83e262363
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserUpFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserUpFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon
+{
+
+public:
+  MetalIconFactory$FileChooserUpFolderIcon();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
new file mode 100644
index 00000000000..90f451b9127
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileIcon16;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileIcon16 : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileIcon16();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
new file mode 100644
index 00000000000..80ed1ebdd4d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
+#define __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FolderIcon16;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FolderIcon16 : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FolderIcon16();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
new file mode 100644
index 00000000000..cf726d87d54
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$HorizontalSliderThumbIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$HorizontalSliderThumbIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$HorizontalSliderThumbIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
new file mode 100644
index 00000000000..07a8d256acd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameAltMaximizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameAltMaximizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameAltMaximizeIcon(jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
new file mode 100644
index 00000000000..30289db5cfc
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameCloseIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameCloseIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameCloseIcon(jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
new file mode 100644
index 00000000000..0c111ca032c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameDefaultMenuIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameDefaultMenuIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameDefaultMenuIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
new file mode 100644
index 00000000000..95014b00c7b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameMaximizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMaximizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameMaximizeIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
new file mode 100644
index 00000000000..122d0282877
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameMinimizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMinimizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameMinimizeIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
new file mode 100644
index 00000000000..11ee59a1575
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$PaletteCloseIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$PaletteCloseIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$PaletteCloseIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
new file mode 100644
index 00000000000..8d7eb638a28
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$RadioButtonIcon();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  static JArray< JArray< jint > * > * gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
new file mode 100644
index 00000000000..4d0e722ad00
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$RadioButtonMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$RadioButtonMenuItemIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$RadioButtonMenuItemIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
new file mode 100644
index 00000000000..f469798827d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeComputerIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeComputerIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeComputerIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
new file mode 100644
index 00000000000..c0e9716dcc8
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeControlIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeControlIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeControlIcon(jboolean);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintMe(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLight;
+private:
+  jboolean collapsed;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
new file mode 100644
index 00000000000..ad69d2d496b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeFloppyDriveIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeFloppyDriveIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeFloppyDriveIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
new file mode 100644
index 00000000000..4993efdb24d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FolderIcon16
+{
+
+public:
+  MetalIconFactory$TreeFolderIcon();
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
new file mode 100644
index 00000000000..1eb1d51434b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeHardDriveIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeHardDriveIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeHardDriveIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
new file mode 100644
index 00000000000..df2b8e8dab5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeLeafIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeLeafIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileIcon16
+{
+
+public:
+  MetalIconFactory$TreeLeafIcon();
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
new file mode 100644
index 00000000000..7618da789f3
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$VerticalSliderThumbIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$VerticalSliderThumbIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$VerticalSliderThumbIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory.h b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
new file mode 100644
index 00000000000..f1cb1d77e23
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory__
+#define __javax_swing_plaf_metal_MetalIconFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory;
+            class MetalIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory();
+  static ::javax::swing::Icon * getCheckBoxIcon();
+  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
+  static ::javax::swing::Icon * getFileChooserDetailViewIcon();
+  static ::javax::swing::Icon * getFileChooserHomeFolderIcon();
+  static ::javax::swing::Icon * getFileChooserListViewIcon();
+  static ::javax::swing::Icon * getFileChooserNewFolderIcon();
+  static ::javax::swing::Icon * getFileChooserUpFolderIcon();
+  static ::javax::swing::Icon * getRadioButtonIcon();
+  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
+  static ::javax::swing::Icon * getHorizontalSliderThumbIcon();
+  static ::javax::swing::Icon * getInternalFrameCloseIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameDefaultMenuIcon();
+  static ::javax::swing::Icon * getInternalFrameMaximizeIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameMinimizeIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameAltMaximizeIcon(jint);
+  static ::javax::swing::Icon * getVerticalSliderThumbIcon();
+  static ::javax::swing::Icon * getTreeFolderIcon();
+  static ::javax::swing::Icon * getTreeLeafIcon();
+  static ::javax::swing::Icon * getTreeControlIcon(jboolean);
+  static ::javax::swing::Icon * getTreeComputerIcon();
+  static ::javax::swing::Icon * getTreeFloppyDriveIcon();
+  static ::javax::swing::Icon * getTreeHardDriveIcon();
+  static ::javax::swing::Icon * getMenuArrowIcon();
+  static ::javax::swing::Icon * getMenuItemArrowIcon();
+  static ::javax::swing::Icon * getMenuItemCheckIcon();
+  static const jboolean DARK = 0;
+  static const jboolean LIGHT = 1;
+private:
+  static ::javax::swing::Icon * menuArrow;
+  static ::javax::swing::Icon * menuItemArrow;
+  static ::javax::swing::Icon * checkBoxIcon;
+  static ::javax::swing::Icon * checkBoxMenuItemIcon;
+  static ::javax::swing::Icon * fileChooserDetailViewIcon;
+  static ::javax::swing::Icon * fileChooserHomeFolderIcon;
+  static ::javax::swing::Icon * fileChooserListViewIcon;
+  static ::javax::swing::Icon * fileChooserNewFolderIcon;
+  static ::javax::swing::Icon * fileChooserUpFolderIcon;
+  static ::javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon * radioButtonIcon;
+  static ::javax::swing::Icon * radioButtonMenuItemIcon;
+  static ::javax::swing::Icon * internalFrameDefaultMenuIcon;
+  static ::javax::swing::Icon * treeComputerIcon;
+  static ::javax::swing::Icon * treeFloppyDriveIcon;
+  static ::javax::swing::Icon * treeHardDriveIcon;
+  static ::javax::swing::Icon * horizontalSliderThumbIcon;
+  static ::javax::swing::Icon * verticalSliderThumbIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
new file mode 100644
index 00000000000..ba566882302
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+            class MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler
+{
+
+public:
+  MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
new file mode 100644
index 00000000000..da7e76cb710
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+            class MetalInternalFrameTitlePane$MetalTitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  MetalInternalFrameTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
new file mode 100644
index 00000000000..f3c0e7faba8
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JButton;
+        class JInternalFrame;
+        class JLabel;
+        class JMenu;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane
+{
+
+public:
+  MetalInternalFrameTitlePane(::javax::swing::JInternalFrame *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void createButtons();
+  virtual void addSystemMenuItems(::javax::swing::JMenu *);
+  virtual void showSystemMenu();
+  virtual void addSubComponents();
+  virtual ::java::awt::LayoutManager * createLayout();
+public:
+  virtual void paintPalette(::java::awt::Graphics *);
+  virtual void paintComponent(::java::awt::Graphics *);
+  virtual void setPalette(jboolean);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+public: // actually package-private
+  static ::javax::swing::JInternalFrame * access$0(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$1(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$2(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$3(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$4(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$5(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$6(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane)))) isPalette;
+  ::javax::swing::Icon * paletteCloseIcon;
+  jint paletteTitleHeight;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
new file mode 100644
index 00000000000..9ac979b2b10
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI$1__
+#define __javax_swing_plaf_metal_MetalInternalFrameUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameUI;
+            class MetalInternalFrameUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalInternalFrameUI$1(::javax::swing::plaf::metal::MetalInternalFrameUI *);
+public:
+  void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameUI$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
new file mode 100644
index 00000000000..db9fe9d86c9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI__
+#define __javax_swing_plaf_metal_MetalInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JInternalFrame;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalInternalFrameUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameUI : public ::javax::swing::plaf::basic::BasicInternalFrameUI
+{
+
+public:
+  MetalInternalFrameUI(::javax::swing::JInternalFrame *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
+public:
+  virtual void setPalette(jboolean);
+public: // actually protected
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installKeyboardActions();
+  static ::java::lang::String * IS_PALETTE;
+private:
+  ::java::beans::PropertyChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameUI)))) paletteListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLabelUI.h b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
new file mode 100644
index 00000000000..f91d0993d3a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLabelUI__
+#define __javax_swing_plaf_metal_MetalLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLabelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JLabel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLabelUI : public ::javax::swing::plaf::basic::BasicLabelUI
+{
+
+public:
+  MetalLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+  static ::javax::swing::plaf::metal::MetalLabelUI * metalLabelUI;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLabelUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
new file mode 100644
index 00000000000..9159117de4d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLookAndFeel$1__
+#define __javax_swing_plaf_metal_MetalLookAndFeel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalLookAndFeel;
+            class MetalLookAndFeel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLookAndFeel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalLookAndFeel$1(::javax::swing::plaf::metal::MetalLookAndFeel *);
+public:
+  ::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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
new file mode 100644
index 00000000000..9985b60b9e6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
@@ -0,0 +1,103 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLookAndFeel__
+#define __javax_swing_plaf_metal_MetalLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class MetalLookAndFeel;
+            class MetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
+{
+
+public:
+  MetalLookAndFeel();
+public: // actually protected
+  virtual void createDefaultTheme();
+public:
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+  virtual ::java::lang::String * getDescription();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  static ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
+  static ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
+  static ::javax::swing::plaf::ColorUIResource * getBlack();
+  static ::javax::swing::plaf::ColorUIResource * getControl();
+  static ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
+  static ::javax::swing::plaf::ColorUIResource * getControlDisabled();
+  static ::javax::swing::plaf::ColorUIResource * getControlHighlight();
+  static ::javax::swing::plaf::ColorUIResource * getControlInfo();
+  static ::javax::swing::plaf::ColorUIResource * getControlShadow();
+  static ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  static ::javax::swing::plaf::FontUIResource * getControlTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  static ::javax::swing::plaf::ColorUIResource * getFocusColor();
+  static ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getMenuBackground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuForeground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
+  static ::javax::swing::plaf::FontUIResource * getMenuTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
+  static ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
+  static ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
+  static ::javax::swing::plaf::FontUIResource * getSubTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
+  static ::javax::swing::plaf::FontUIResource * getSystemTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
+  static ::javax::swing::plaf::ColorUIResource * getUserTextColor();
+  static ::javax::swing::plaf::FontUIResource * getUserTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getWhite();
+  static ::javax::swing::plaf::ColorUIResource * getWindowBackground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
+  static ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
+  static void setCurrentTheme(::javax::swing::plaf::metal::MetalTheme *);
+public: // actually protected
+  virtual void initClassDefaults(::javax::swing::UIDefaults *);
+  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
+  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
+public:
+  static ::javax::swing::plaf::metal::MetalTheme * getCurrentTheme();
+  virtual jboolean getSupportsWindowDecorations();
+private:
+  static const jlong serialVersionUID = 6680646159193457980LL;
+  static ::javax::swing::plaf::metal::MetalTheme * theme;
+  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicLookAndFeel)))) LAF_defaults;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLookAndFeel__
diff --git a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
new file mode 100644
index 00000000000..598291e4005
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalMenuBarUI__
+#define __javax_swing_plaf_metal_MetalMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalMenuBarUI : public ::javax::swing::plaf::basic::BasicMenuBarUI
+{
+
+public:
+  MetalMenuBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalMenuBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
new file mode 100644
index 00000000000..ca38d005b4d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
+#define __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalSeparatorUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalPopupMenuSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalPopupMenuSeparatorUI : public ::javax::swing::plaf::metal::MetalSeparatorUI
+{
+
+public:
+  MetalPopupMenuSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::metal::MetalPopupMenuSeparatorUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
new file mode 100644
index 00000000000..ca9500ac5b2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalProgressBarUI__
+#define __javax_swing_plaf_metal_MetalProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicProgressBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalProgressBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalProgressBarUI : public ::javax::swing::plaf::basic::BasicProgressBarUI
+{
+
+public:
+  MetalProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalProgressBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
new file mode 100644
index 00000000000..477bca7cacc
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRadioButtonUI__
+#define __javax_swing_plaf_metal_MetalRadioButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalRadioButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRadioButtonUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
+{
+
+public:
+  MetalRadioButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+  virtual ::java::awt::Color * getFocusColor();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicRadioButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
new file mode 100644
index 00000000000..aa5a0eb84d9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+  MetalRootPaneUI$MetalFrameBorder();
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  MetalRootPaneUI$MetalFrameBorder(::javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
new file mode 100644
index 00000000000..8cf2767d29d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalRootLayout;
+            class MetalRootPaneUI$MetalTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalRootLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalRootPaneUI$MetalRootLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
+  ::java::awt::Rectangle * layeredPaneBounds;
+  ::java::awt::Rectangle * contentPaneBounds;
+  ::java::awt::Rectangle * menuBarBounds;
+  ::java::awt::Rectangle * titlePaneBounds;
+  ::java::awt::Dimension * prefSize;
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * titlePane;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
new file mode 100644
index 00000000000..5837b81a47a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$CloseAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
new file mode 100644
index 00000000000..ea82f56189e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$IconifyAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction : public ::javax::swing::AbstractAction
+{
+
+  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction *);
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
new file mode 100644
index 00000000000..bad5edc2aca
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction *);
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
new file mode 100644
index 00000000000..5bc79486c69
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
new file mode 100644
index 00000000000..a1ee9cd5ca2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler : public ::javax::swing::event::MouseInputAdapter
+{
+
+  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler *);
+  ::java::awt::Point * __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) lastDragLocation;
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
new file mode 100644
index 00000000000..1505f5c47c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$PaneButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$PaneButton : public ::javax::swing::JButton
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$PaneButton(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::Action *);
+  virtual jboolean isFocusable();
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
new file mode 100644
index 00000000000..d9adc9b8a64
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
@@ -0,0 +1,98 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class LayoutManager;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JLabel;
+        class JMenu;
+        class JMenuBar;
+        class JRootPane;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane : public ::javax::swing::JComponent
+{
+
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane(::javax::swing::JRootPane *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayout();
+  virtual void installTitlePane();
+private:
+  void enableActions();
+  void addSubComponents();
+  void installListeners();
+  void createActions();
+  void assembleSystemMenu();
+public: // actually protected
+  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
+  virtual ::javax::swing::JMenu * createSystemMenu();
+private:
+  void addSystemMenuItems(::javax::swing::JMenu *);
+public: // actually protected
+  virtual void createButtons();
+  virtual void setButtonIcons();
+public:
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintTitleBackground(::java::awt::Graphics *);
+private:
+  void installDefaults();
+public: // actually package-private
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) rootPane;
+  ::javax::swing::JButton * closeButton;
+  ::javax::swing::JButton * iconButton;
+  ::javax::swing::JButton * maxButton;
+  ::javax::swing::Icon * minIcon;
+  ::javax::swing::Icon * maxIcon;
+private:
+  ::javax::swing::Icon * iconIcon;
+public: // actually package-private
+  ::javax::swing::Icon * closeIcon;
+private:
+  ::java::awt::Color * notSelectedTitleColor;
+  ::java::awt::Color * selectedTitleColor;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+private:
+  ::javax::swing::Action * closeAction;
+  ::javax::swing::Action * iconifyAction;
+  ::javax::swing::Action * maximizeAction;
+  ::javax::swing::JMenuBar * menuBar;
+public: // actually protected
+  ::javax::swing::JMenu * windowMenu;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
new file mode 100644
index 00000000000..dad96a54484
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI__
+#define __javax_swing_plaf_metal_MetalRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRootPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JRootPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI : public ::javax::swing::plaf::basic::BasicRootPaneUI
+{
+
+public:
+  MetalRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  void installWindowDecorations(::javax::swing::JRootPane *);
+  void uninstallWindowDecorations(::javax::swing::JRootPane *);
+  static ::javax::swing::plaf::metal::MetalRootPaneUI * instance;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
new file mode 100644
index 00000000000..911ed4ddeb1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
+#define __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalScrollBarUI;
+            class MetalScrollBarUI$MetalScrollBarPropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollBarUI$MetalScrollBarPropertyChangeHandler : public ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler
+{
+
+public:
+  MetalScrollBarUI$MetalScrollBarPropertyChangeHandler(::javax::swing::plaf::metal::MetalScrollBarUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
new file mode 100644
index 00000000000..f76d33bddfb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollBarUI__
+#define __javax_swing_plaf_metal_MetalScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalScrollBarUI;
+            class MetalScrollButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollBarUI : public ::javax::swing::plaf::basic::BasicScrollBarUI
+{
+
+public:
+  MetalScrollBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::javax::swing::JButton * createDecreaseButton(jint);
+  virtual ::javax::swing::JButton * createIncreaseButton(jint);
+  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+private:
+  void paintTrackHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
+  void paintTrackVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
+public: // actually protected
+  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+private:
+  void paintThumbHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  void paintThumbVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMinimumThumbSize();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  static ::java::lang::String * FREE_STANDING_PROP;
+private:
+  static ::java::awt::Dimension * MIN_THUMB_SIZE;
+  static ::java::awt::Dimension * MIN_THUMB_SIZE_FREE_STANDING;
+public: // actually protected
+  ::javax::swing::plaf::metal::MetalScrollButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI)))) increaseButton;
+  ::javax::swing::plaf::metal::MetalScrollButton * decreaseButton;
+  jint scrollBarWidth;
+  jboolean isFreeStanding;
+public: // actually package-private
+  ::java::awt::Color * scrollBarShadowColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollButton.h b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
new file mode 100644
index 00000000000..3a3d86125f2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollButton__
+#define __javax_swing_plaf_metal_MetalScrollButton__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicArrowButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalScrollButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollButton : public ::javax::swing::plaf::basic::BasicArrowButton
+{
+
+public:
+  MetalScrollButton(jint, jint, jboolean);
+  virtual jint getButtonWidth();
+  virtual void setFreeStanding(jboolean);
+  virtual void paint(::java::awt::Graphics *);
+private:
+  void paintArrow(::java::awt::Graphics *, jint, jint);
+  void paintNorthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintSouthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintEastBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintWestBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintNorthBorder(::java::awt::Graphics *, jint, jint);
+  void paintSouthBorder(::java::awt::Graphics *, jint, jint);
+  void paintEastBorder(::java::awt::Graphics *, jint, jint);
+  void paintWestBorder(::java::awt::Graphics *, jint, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+private:
+  static ::java::awt::Dimension * maximumSize;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) buttonWidth;
+  jboolean freeStanding;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
new file mode 100644
index 00000000000..f751c355ee2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollPaneUI__
+#define __javax_swing_plaf_metal_MetalScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JScrollPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollPaneUI : public ::javax::swing::plaf::basic::BasicScrollPaneUI
+{
+
+public:
+  MetalScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void installListeners(::javax::swing::JScrollPane *);
+  virtual void uninstallListeners(::javax::swing::JScrollPane *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createScrollBarSwapListener();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
new file mode 100644
index 00000000000..afa4a33c713
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSeparatorUI__
+#define __javax_swing_plaf_metal_MetalSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  MetalSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::metal::MetalSeparatorUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
new file mode 100644
index 00000000000..a3b9554cb12
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
+#define __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSliderUI;
+            class MetalSliderUI$MetalPropertyListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSliderUI$MetalPropertyListener : public ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler
+{
+
+public: // actually protected
+  MetalSliderUI$MetalPropertyListener(::javax::swing::plaf::metal::MetalSliderUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI.h b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
new file mode 100644
index 00000000000..555e0b37dd5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSliderUI__
+#define __javax_swing_plaf_metal_MetalSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSliderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JSlider;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalSliderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSliderUI : public ::javax::swing::plaf::basic::BasicSliderUI
+{
+
+public:
+  MetalSliderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
+public:
+  virtual void paintThumb(::java::awt::Graphics *);
+  virtual void paintTrack(::java::awt::Graphics *);
+  virtual void paintFocus(::java::awt::Graphics *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getThumbSize();
+public:
+  virtual jint getTickLength();
+public: // actually protected
+  virtual jint getTrackWidth();
+  virtual jint getTrackLength();
+  virtual jint getThumbOverhang();
+  virtual void scrollDueToClickInTrack(jint);
+  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  static ::java::awt::Color * thumbColor;
+  static ::java::awt::Color * highlightColor;
+  static ::java::awt::Color * darkShadowColor;
+  static jint trackWidth;
+  static jint tickLength;
+  static ::javax::swing::Icon * horizThumbIcon;
+  static ::javax::swing::Icon * vertThumbIcon;
+  const jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI)))) TICK_BUFFER;
+  ::java::lang::String * SLIDER_FILL;
+  jboolean filledSlider;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSliderUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
new file mode 100644
index 00000000000..707fe29327c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
+#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicArrowButton;
+        }
+        namespace metal
+        {
+            class MetalSplitPaneDivider;
+            class MetalSplitPaneDivider$MetalDividerLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalDividerLayout : public ::java::lang::Object
+{
+
+public:
+  MetalSplitPaneDivider$MetalDividerLayout(::javax::swing::plaf::metal::MetalSplitPaneDivider *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicArrowButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rb;
+  ::javax::swing::plaf::basic::BasicArrowButton * lb;
+  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
new file mode 100644
index 00000000000..ee348d7779d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
+#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSplitPaneDivider;
+            class MetalSplitPaneDivider$MetalOneTouchButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalOneTouchButton : public ::javax::swing::JButton
+{
+
+public: // actually package-private
+  MetalSplitPaneDivider$MetalOneTouchButton(::javax::swing::plaf::metal::MetalSplitPaneDivider *, jint);
+public:
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual jboolean isFocusTraversable();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  static const jint LEFT = 0;
+  static const jint RIGHT = 1;
+private:
+  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) colors;
+  jint direction;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
new file mode 100644
index 00000000000..7230f6051e7
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider__
+#define __javax_swing_plaf_metal_MetalSplitPaneDivider__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneDivider.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JSplitPane;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSplitPaneDivider;
+            class MetalSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneDivider : public ::javax::swing::plaf::basic::BasicSplitPaneDivider
+{
+
+public:
+  MetalSplitPaneDivider(::javax::swing::plaf::metal::MetalSplitPaneUI *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paint(::java::awt::Graphics *);
+public: // actually protected
+  virtual ::javax::swing::JButton * createLeftOneTouchButton();
+  virtual ::javax::swing::JButton * createRightOneTouchButton();
+public: // actually package-private
+  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_L;
+  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_R;
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider)))) dark;
+  ::java::awt::Color * light;
+  ::javax::swing::JSplitPane * splitPane;
+  jint orientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
new file mode 100644
index 00000000000..2505e06c27c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneUI__
+#define __javax_swing_plaf_metal_MetalSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+        }
+        namespace metal
+        {
+            class MetalSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneUI : public ::javax::swing::plaf::basic::BasicSplitPaneUI
+{
+
+public:
+  MetalSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
new file mode 100644
index 00000000000..0aa2214c5a2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
+#define __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalTabbedPaneUI;
+            class MetalTabbedPaneUI$TabbedPaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTabbedPaneUI$TabbedPaneLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
+{
+
+public:
+  MetalTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::metal::MetalTabbedPaneUI *);
+public: // actually protected
+  virtual void rotateTabRuns(jint, jint);
+  virtual void padSelectedTab(jint, jint);
+  virtual void normalizeTabRuns(jint, jint, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
new file mode 100644
index 00000000000..12fdef6c931
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI__
+#define __javax_swing_plaf_metal_MetalTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class LayoutManager;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTabbedPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTabbedPaneUI : public ::javax::swing::plaf::basic::BasicTabbedPaneUI
+{
+
+public:
+  MetalTabbedPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTopTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintLeftTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintRightTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintBottomTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual jboolean shouldPadTabRun(jint, jint);
+  virtual void installDefaults();
+  virtual ::java::awt::Color * getColorForGap(jint, jint, jint);
+  virtual jboolean shouldFillGap(jint, jint, jint, jint);
+  virtual void paintHighlightBelowTab();
+  virtual jboolean shouldRotateTabRuns(jint, jint);
+  virtual jint calculateMaxTabHeight(jint);
+  virtual jint getTabRunOverlay(jint);
+  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+private:
+  jboolean isLastTabInRun(jint);
+  ::java::awt::Color * getUnselectedBackground(jint);
+public: // actually protected
+  virtual jint getTabLabelShiftX(jint, jint, jboolean);
+  virtual jint getTabLabelShiftY(jint, jint, jboolean);
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI)))) minTabWidth;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * selectHighlight;
+  ::java::awt::Color * tabAreaBackground;
+private:
+  ::java::awt::Graphics * hg;
+  jboolean tabsOpaque;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
new file mode 100644
index 00000000000..610de0bfbde
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTextFieldUI__
+#define __javax_swing_plaf_metal_MetalTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTextFieldUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  MetalTextFieldUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTextFieldUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTheme.h b/libjava/javax/swing/plaf/metal/MetalTheme.h
new file mode 100644
index 00000000000..e8e813a88d5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTheme.h
@@ -0,0 +1,94 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTheme__
+#define __javax_swing_plaf_metal_MetalTheme__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class MetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTheme : public ::java::lang::Object
+{
+
+public:
+  MetalTheme();
+  virtual ::java::lang::String * getName() = 0;
+  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
+  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getControl();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlDisabled();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlHighlight();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlInfo();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getFocusColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getUserTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
+  virtual ::javax::swing::plaf::ColorUIResource * getWhite();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3() = 0;
+public:
+  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont() = 0;
+private:
+  ::javax::swing::plaf::ColorUIResource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) BLACK;
+  ::javax::swing::plaf::ColorUIResource * WHITE;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
new file mode 100644
index 00000000000..a53cb8b0118
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToggleButtonUI__
+#define __javax_swing_plaf_metal_MetalToggleButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToggleButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToggleButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalToggleButtonUI();
+public: // actually protected
+  virtual ::java::awt::Color * getFocusColor();
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+public:
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
new file mode 100644
index 00000000000..b04a7bb6353
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalContainerListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalContainerListener : public ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener
+{
+
+public: // actually protected
+  MetalToolBarUI$MetalContainerListener(::javax::swing::plaf::metal::MetalToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
new file mode 100644
index 00000000000..f509544b3aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalDockingListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalDockingListener : public ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener
+{
+
+public:
+  MetalToolBarUI$MetalDockingListener(::javax::swing::plaf::metal::MetalToolBarUI *, ::javax::swing::JToolBar *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
new file mode 100644
index 00000000000..8b254a6c133
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalRolloverListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalRolloverListener : public ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener
+{
+
+public: // actually protected
+  MetalToolBarUI$MetalRolloverListener(::javax::swing::plaf::metal::MetalToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
new file mode 100644
index 00000000000..95be69ffd07
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI__
+#define __javax_swing_plaf_metal_MetalToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Point;
+      namespace event
+      {
+          class ContainerListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToolBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI : public ::javax::swing::plaf::basic::BasicToolBarUI
+{
+
+public:
+  MetalToolBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createRolloverListener();
+  virtual ::java::awt::event::ContainerListener * createContainerListener();
+  virtual ::javax::swing::border::Border * createNonRolloverBorder();
+  virtual void setDragOffset(::java::awt::Point *);
+  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI)))) contListener;
+  ::java::beans::PropertyChangeListener * rolloverListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
new file mode 100644
index 00000000000..f38637c6db2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolTipUI__
+#define __javax_swing_plaf_metal_MetalToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolTipUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class KeyStroke;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolTipUI : public ::javax::swing::plaf::basic::BasicToolTipUI
+{
+
+public:
+  MetalToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getAcceleratorString();
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jboolean isAcceleratorHidden();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::java::lang::String * fetchAcceleratorString(::javax::swing::JComponent *);
+  ::java::lang::String * acceleratorToString(::javax::swing::KeyStroke *);
+public:
+  static const jint padSpaceBetweenStrings = 12;
+private:
+  static ::javax::swing::plaf::metal::MetalToolTipUI * instance;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolTipUI)))) isAcceleratorHidden__;
+  ::java::lang::String * acceleratorString;
+  ::java::lang::String * acceleratorDelimiter;
+  ::java::awt::Font * acceleratorFont;
+  ::java::awt::Color * acceleratorForeground;
+  ::javax::swing::border::Border * activeBorder;
+  ::javax::swing::border::Border * inactiveBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolTipUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
new file mode 100644
index 00000000000..e0ffe068fc3
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
+#define __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalTreeUI;
+            class MetalTreeUI$LineStyleListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTreeUI$LineStyleListener : public ::java::lang::Object
+{
+
+  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *, ::javax::swing::plaf::metal::MetalTreeUI$LineStyleListener *);
+  ::javax::swing::plaf::metal::MetalTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI.h b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
new file mode 100644
index 00000000000..98cf994a24f
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTreeUI__
+#define __javax_swing_plaf_metal_MetalTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTreeUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTreeUI : public ::javax::swing::plaf::basic::BasicTreeUI
+{
+
+public:
+  MetalTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getHorizontalLegBuffer();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void decodeLineStyle(::java::lang::Object *);
+  virtual jboolean isLocationInExpandControl(jint, jint, jint, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintHorizontalSeparators(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
+  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+private:
+  static ::java::lang::String * LINE_STYLE_PROPERTY;
+  static ::java::lang::String * LINE_STYLE_VALUE_NONE;
+  static ::java::lang::String * LINE_STYLE_VALUE_ANGLED;
+  static ::java::lang::String * LINE_STYLE_VALUE_HORIZONTAL;
+  static const jint LINE_STYLE_NONE = 0;
+  static const jint LINE_STYLE_ANGLED = 1;
+  static const jint LINE_STYLE_HORIZONTAL = 2;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTreeUI)))) lineStyle;
+  ::java::beans::PropertyChangeListener * lineStyleListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTreeUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalUtils.h b/libjava/javax/swing/plaf/metal/MetalUtils.h
new file mode 100644
index 00000000000..3dd94a23fde
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalUtils.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalUtils__
+#define __javax_swing_plaf_metal_MetalUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Graphics2D;
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalUtils : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalUtils();
+  static void fillMetalPattern(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static void fillMetalPattern2D(::java::awt::Graphics2D *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static void initializePattern(::java::awt::Color *, ::java::awt::Color *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *, JArray< JArray< jint > * > *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, JArray< JArray< jint > * > *);
+  static void paintHorizontalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+  static void paintVerticalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+private:
+  static void paintHorizontalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+  static void paintVerticalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+public: // actually package-private
+  static ::java::awt::image::BufferedImage * pattern2D;
+  static ::java::awt::Color * lightColor;
+  static ::java::awt::Color * darkColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalUtils__
diff --git a/libjava/javax/swing/plaf/metal/OceanTheme.h b/libjava/javax/swing/plaf/metal/OceanTheme.h
new file mode 100644
index 00000000000..2587609811f
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/OceanTheme.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_OceanTheme__
+#define __javax_swing_plaf_metal_OceanTheme__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/DefaultMetalTheme.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+        namespace metal
+        {
+            class OceanTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::OceanTheme : public ::javax::swing::plaf::metal::DefaultMetalTheme
+{
+
+public:
+  OceanTheme();
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
+public:
+  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
+public: // actually package-private
+  static ::javax::swing::plaf::ColorUIResource * BLACK;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
+  static ::javax::swing::plaf::ColorUIResource * INACTIVE_CONTROL_TEXT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_OceanTheme__
diff --git a/libjava/javax/swing/plaf/multi/MultiButtonUI.h b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
new file mode 100644
index 00000000000..3481b6eee4e
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiButtonUI__
+#define __javax_swing_plaf_multi_MultiButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiButtonUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  MultiButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiButtonUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
new file mode 100644
index 00000000000..d890eeabef3
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiColorChooserUI__
+#define __javax_swing_plaf_multi_MultiColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ColorChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiColorChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
+{
+
+public:
+  MultiColorChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiColorChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
new file mode 100644
index 00000000000..9e92a3237d6
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiComboBoxUI__
+#define __javax_swing_plaf_multi_MultiComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComboBoxUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComboBox;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiComboBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
+{
+
+public:
+  MultiComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiComboBoxUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
new file mode 100644
index 00000000000..d7a5f47fe08
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiDesktopIconUI__
+#define __javax_swing_plaf_multi_MultiDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopIconUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiDesktopIconUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
+{
+
+public:
+  MultiDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
new file mode 100644
index 00000000000..d6dcff2c2b8
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiDesktopPaneUI__
+#define __javax_swing_plaf_multi_MultiDesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiDesktopPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
+{
+
+public:
+  MultiDesktopPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
new file mode 100644
index 00000000000..e459d3280a7
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
@@ -0,0 +1,78 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiFileChooserUI__
+#define __javax_swing_plaf_multi_MultiFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/FileChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JFileChooser;
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiFileChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiFileChooserUI : public ::javax::swing::plaf::FileChooserUI
+{
+
+public:
+  MultiFileChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiFileChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
new file mode 100644
index 00000000000..ab260b70989
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiInternalFrameUI__
+#define __javax_swing_plaf_multi_MultiInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/InternalFrameUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiInternalFrameUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
+{
+
+public:
+  MultiInternalFrameUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLabelUI.h b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
new file mode 100644
index 00000000000..7f5049cecb1
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiLabelUI__
+#define __javax_swing_plaf_multi_MultiLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/LabelUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiLabelUI : public ::javax::swing::plaf::LabelUI
+{
+
+public:
+  MultiLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiLabelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiListUI.h b/libjava/javax/swing/plaf/multi/MultiListUI.h
new file mode 100644
index 00000000000..3147894c629
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiListUI.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiListUI__
+#define __javax_swing_plaf_multi_MultiListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ListUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JList;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiListUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiListUI : public ::javax::swing::plaf::ListUI
+{
+
+public:
+  MultiListUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiListUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
new file mode 100644
index 00000000000..83925d036ed
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiLookAndFeel__
+#define __javax_swing_plaf_multi_MultiLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/LookAndFeel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class UIDefaults;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiLookAndFeel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiLookAndFeel : public ::javax::swing::LookAndFeel
+{
+
+public:
+  MultiLookAndFeel();
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getDescription();
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  static ::javax::swing::plaf::ComponentUI * createUIs(::javax::swing::plaf::ComponentUI *, ::java::util::Vector *, ::javax::swing::JComponent *);
+public: // actually protected
+  static JArray< ::javax::swing::plaf::ComponentUI * > * uisToArray(::java::util::Vector *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiLookAndFeel__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
new file mode 100644
index 00000000000..9056557b4c7
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiMenuBarUI__
+#define __javax_swing_plaf_multi_MultiMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiMenuBarUI : public ::javax::swing::plaf::MenuBarUI
+{
+
+public:
+  MultiMenuBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiMenuBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
new file mode 100644
index 00000000000..7bbe2f23173
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiMenuItemUI__
+#define __javax_swing_plaf_multi_MultiMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiMenuItemUI : public ::javax::swing::plaf::MenuItemUI
+{
+
+public:
+  MultiMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiMenuItemUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
new file mode 100644
index 00000000000..ce895299c71
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiOptionPaneUI__
+#define __javax_swing_plaf_multi_MultiOptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/OptionPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JOptionPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiOptionPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
+{
+
+public:
+  MultiOptionPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void selectInitialValue(::javax::swing::JOptionPane *);
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPanelUI.h b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
new file mode 100644
index 00000000000..83ac57c09d0
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiPanelUI__
+#define __javax_swing_plaf_multi_MultiPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PanelUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiPanelUI : public ::javax::swing::plaf::PanelUI
+{
+
+public:
+  MultiPanelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PanelUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiPanelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
new file mode 100644
index 00000000000..717775652cd
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiPopupMenuUI__
+#define __javax_swing_plaf_multi_MultiPopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PopupMenuUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiPopupMenuUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
+{
+
+public:
+  MultiPopupMenuUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
new file mode 100644
index 00000000000..797f3cab584
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiProgressBarUI__
+#define __javax_swing_plaf_multi_MultiProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ProgressBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiProgressBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
+{
+
+public:
+  MultiProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiProgressBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
new file mode 100644
index 00000000000..b45c22996f9
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiRootPaneUI__
+#define __javax_swing_plaf_multi_MultiRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/RootPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiRootPaneUI : public ::javax::swing::plaf::RootPaneUI
+{
+
+public:
+  MultiRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::RootPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiRootPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
new file mode 100644
index 00000000000..0fd88116ad8
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiScrollBarUI__
+#define __javax_swing_plaf_multi_MultiScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiScrollBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
+{
+
+public:
+  MultiScrollBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiScrollBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
new file mode 100644
index 00000000000..a05716a60a0
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiScrollPaneUI__
+#define __javax_swing_plaf_multi_MultiScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
+{
+
+public:
+  MultiScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
new file mode 100644
index 00000000000..b62235a18cd
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSeparatorUI__
+#define __javax_swing_plaf_multi_MultiSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SeparatorUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSeparatorUI : public ::javax::swing::plaf::SeparatorUI
+{
+
+public:
+  MultiSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSeparatorUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSliderUI.h b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
new file mode 100644
index 00000000000..b66d32ab54e
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSliderUI__
+#define __javax_swing_plaf_multi_MultiSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SliderUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSliderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSliderUI : public ::javax::swing::plaf::SliderUI
+{
+
+public:
+  MultiSliderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSliderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
new file mode 100644
index 00000000000..32a9d868252
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSpinnerUI__
+#define __javax_swing_plaf_multi_MultiSpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SpinnerUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSpinnerUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSpinnerUI : public ::javax::swing::plaf::SpinnerUI
+{
+
+public:
+  MultiSpinnerUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSpinnerUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
new file mode 100644
index 00000000000..5ed5638fe88
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSplitPaneUI__
+#define __javax_swing_plaf_multi_MultiSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SplitPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JSplitPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
+{
+
+public:
+  MultiSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
new file mode 100644
index 00000000000..7740c3fd183
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTabbedPaneUI__
+#define __javax_swing_plaf_multi_MultiTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JTabbedPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTabbedPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
+{
+
+public:
+  MultiTabbedPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
new file mode 100644
index 00000000000..87cf03ef5a5
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTableHeaderUI__
+#define __javax_swing_plaf_multi_MultiTableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableHeaderUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTableHeaderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
+{
+
+public:
+  MultiTableHeaderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableUI.h b/libjava/javax/swing/plaf/multi/MultiTableUI.h
new file mode 100644
index 00000000000..cb84f0f2c53
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTableUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTableUI__
+#define __javax_swing_plaf_multi_MultiTableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTableUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTableUI : public ::javax::swing::plaf::TableUI
+{
+
+public:
+  MultiTableUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTableUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTextUI.h b/libjava/javax/swing/plaf/multi/MultiTextUI.h
new file mode 100644
index 00000000000..6d0440e7a88
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTextUI.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTextUI__
+#define __javax_swing_plaf_multi_MultiTextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TextUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTextUI;
+        }
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTextUI : public ::javax::swing::plaf::TextUI
+{
+
+public:
+  MultiTextUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTextUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
new file mode 100644
index 00000000000..91c89162895
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiToolBarUI__
+#define __javax_swing_plaf_multi_MultiToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiToolBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiToolBarUI : public ::javax::swing::plaf::ToolBarUI
+{
+
+public:
+  MultiToolBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiToolBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
new file mode 100644
index 00000000000..07ed28e7372
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiToolTipUI__
+#define __javax_swing_plaf_multi_MultiToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolTipUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiToolTipUI : public ::javax::swing::plaf::ToolTipUI
+{
+
+public:
+  MultiToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiToolTipUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTreeUI.h b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
new file mode 100644
index 00000000000..0477cc6267e
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTreeUI__
+#define __javax_swing_plaf_multi_MultiTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TreeUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JTree;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTreeUI : public ::javax::swing::plaf::TreeUI
+{
+
+public:
+  MultiTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual jint getRowCount(::javax::swing::JTree *);
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
+  virtual jboolean isEditing(::javax::swing::JTree *);
+  virtual jboolean stopEditing(::javax::swing::JTree *);
+  virtual void cancelEditing(::javax::swing::JTree *);
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTreeUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiViewportUI.h b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
new file mode 100644
index 00000000000..6ddbb0b9bd1
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiViewportUI__
+#define __javax_swing_plaf_multi_MultiViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ViewportUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiViewportUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiViewportUI : public ::javax::swing::plaf::ViewportUI
+{
+
+public:
+  MultiViewportUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ViewportUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiViewportUI__
diff --git a/libjava/javax/swing/plaf/synth/ColorType.h b/libjava/javax/swing/plaf/synth/ColorType.h
new file mode 100644
index 00000000000..99a238cf302
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/ColorType.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_ColorType__
+#define __javax_swing_plaf_synth_ColorType__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class ColorType;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::ColorType : public ::java::lang::Object
+{
+
+public: // actually protected
+  ColorType(::java::lang::String *);
+public:
+  virtual jint getID();
+  virtual ::java::lang::String * toString();
+  static ::javax::swing::plaf::synth::ColorType * FOREGROUND;
+  static ::javax::swing::plaf::synth::ColorType * BACKGROUND;
+  static ::javax::swing::plaf::synth::ColorType * TEXT_FOREGROUND;
+  static ::javax::swing::plaf::synth::ColorType * TEXT_BACKGROUND;
+  static ::javax::swing::plaf::synth::ColorType * FOCUS;
+  static jint MAX_COUNT;
+private:
+  static jint count;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
+  ::java::lang::String * description;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_ColorType__
diff --git a/libjava/javax/swing/plaf/synth/Region.h b/libjava/javax/swing/plaf/synth/Region.h
new file mode 100644
index 00000000000..1df2b4f9fc6
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/Region.h
@@ -0,0 +1,102 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_Region__
+#define __javax_swing_plaf_synth_Region__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::Region : public ::java::lang::Object
+{
+
+public: // actually protected
+  Region(::java::lang::String *, ::java::lang::String *, jboolean);
+public:
+  virtual jboolean isSubregion();
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::String * toString();
+  static ::javax::swing::plaf::synth::Region * ARROW_BUTTON;
+  static ::javax::swing::plaf::synth::Region * BUTTON;
+  static ::javax::swing::plaf::synth::Region * CHECK_BOX;
+  static ::javax::swing::plaf::synth::Region * CHECK_BOX_MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * COLOR_CHOOSER;
+  static ::javax::swing::plaf::synth::Region * COMBO_BOX;
+  static ::javax::swing::plaf::synth::Region * DESKTOP_PANE;
+  static ::javax::swing::plaf::synth::Region * DESKTOP_ICON;
+  static ::javax::swing::plaf::synth::Region * EDITOR_PANE;
+  static ::javax::swing::plaf::synth::Region * FILE_CHOOSER;
+  static ::javax::swing::plaf::synth::Region * FORMATTED_TEXT_FIELD;
+  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME;
+  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME_TITLE_PANE;
+  static ::javax::swing::plaf::synth::Region * LABEL;
+  static ::javax::swing::plaf::synth::Region * LIST;
+  static ::javax::swing::plaf::synth::Region * MENU;
+  static ::javax::swing::plaf::synth::Region * MENU_BAR;
+  static ::javax::swing::plaf::synth::Region * MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * MENU_ITEM_ACCELERATOR;
+  static ::javax::swing::plaf::synth::Region * OPTION_PANE;
+  static ::javax::swing::plaf::synth::Region * PANEL;
+  static ::javax::swing::plaf::synth::Region * PASSWORD_FIELD;
+  static ::javax::swing::plaf::synth::Region * POPUP_MENU;
+  static ::javax::swing::plaf::synth::Region * POPUP_MENU_SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * PROGRESS_BAR;
+  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON;
+  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON_MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * ROOT_PANE;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_TRACK;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_THUMB;
+  static ::javax::swing::plaf::synth::Region * SCROLL_PANE;
+  static ::javax::swing::plaf::synth::Region * SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * SLIDER;
+  static ::javax::swing::plaf::synth::Region * SLIDER_TRACK;
+  static ::javax::swing::plaf::synth::Region * SLIDER_THUMB;
+  static ::javax::swing::plaf::synth::Region * SPINNER;
+  static ::javax::swing::plaf::synth::Region * SPLIT_PANE;
+  static ::javax::swing::plaf::synth::Region * SPLIT_PANE_DIVIDER;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB_AREA;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_CONTENT;
+  static ::javax::swing::plaf::synth::Region * TABLE;
+  static ::javax::swing::plaf::synth::Region * TABLE_HEADER;
+  static ::javax::swing::plaf::synth::Region * TEXT_AREA;
+  static ::javax::swing::plaf::synth::Region * TEXT_FIELD;
+  static ::javax::swing::plaf::synth::Region * TEXT_PANE;
+  static ::javax::swing::plaf::synth::Region * TOGGLE_BUTTON;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_CONTENT;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_DRAG_WINDOW;
+  static ::javax::swing::plaf::synth::Region * TOOL_TIP;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * TREE;
+  static ::javax::swing::plaf::synth::Region * TREE_CELL;
+  static ::javax::swing::plaf::synth::Region * VIEWPORT;
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ui;
+private:
+  ::java::lang::String * name;
+  jboolean subregion;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_Region__
diff --git a/libjava/javax/swing/plaf/synth/SynthConstants.h b/libjava/javax/swing/plaf/synth/SynthConstants.h
new file mode 100644
index 00000000000..a6ae6deb832
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthConstants.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthConstants__
+#define __javax_swing_plaf_synth_SynthConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthConstants;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint ENABLED = 1;
+  static const jint DISABLED = 8;
+  static const jint MOUSE_OVER = 2;
+  static const jint PRESSED = 4;
+  static const jint FOCUSED = 256;
+  static const jint SELECTED = 512;
+  static const jint DEFAULT = 1024;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_synth_SynthConstants__
diff --git a/libjava/javax/swing/plaf/synth/SynthContext.h b/libjava/javax/swing/plaf/synth/SynthContext.h
new file mode 100644
index 00000000000..7e2eadb6dc7
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthContext.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthContext__
+#define __javax_swing_plaf_synth_SynthContext__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+            class SynthContext;
+            class SynthStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthContext : public ::java::lang::Object
+{
+
+public:
+  SynthContext(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *, ::javax::swing::plaf::synth::SynthStyle *, jint);
+  virtual ::javax::swing::JComponent * getComponent();
+  virtual ::javax::swing::plaf::synth::Region * getRegion();
+  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle();
+  virtual jint getComponentState();
+private:
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
+  ::javax::swing::plaf::synth::Region * region;
+  ::javax::swing::plaf::synth::SynthStyle * style;
+  jint state;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthContext__
diff --git a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
new file mode 100644
index 00000000000..36c09c1a0d5
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthGraphicsUtils__
+#define __javax_swing_plaf_synth_SynthGraphicsUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthContext;
+            class SynthGraphicsUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthGraphicsUtils : public ::java::lang::Object
+{
+
+public:
+  SynthGraphicsUtils();
+  virtual void drawLine(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::lang::String * layoutText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
+  virtual jint computeStringWidth(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::awt::FontMetrics *, ::java::lang::String *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual jint getMaximumCharHeight(::javax::swing::plaf::synth::SynthContext *);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::java::awt::Rectangle *, jint);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
new file mode 100644
index 00000000000..d0b40a878b7
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthLookAndFeel__
+#define __javax_swing_plaf_synth_SynthLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class UIDefaults;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace synth
+        {
+            class Region;
+            class SynthLookAndFeel;
+            class SynthStyle;
+            class SynthStyleFactory;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
+{
+
+public:
+  SynthLookAndFeel();
+  static void setStyleFactory(::javax::swing::plaf::synth::SynthStyleFactory *);
+  static ::javax::swing::plaf::synth::SynthStyleFactory * getStyleFactory();
+  static ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *);
+  static void updateStyles(::java::awt::Component *);
+  static ::javax::swing::plaf::synth::Region * getRegion(::javax::swing::JComponent *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void initialize();
+  virtual void uninitialize();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  virtual jboolean shouldUpdateStyleOnAncestorChanged();
+  virtual void load(::java::io::InputStream *, ::java::lang::Class *);
+  virtual ::java::lang::String * getDescription();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getName();
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+private:
+  static ::javax::swing::plaf::synth::SynthStyleFactory * styleFactory;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthLookAndFeel__
diff --git a/libjava/javax/swing/plaf/synth/SynthPainter.h b/libjava/javax/swing/plaf/synth/SynthPainter.h
new file mode 100644
index 00000000000..23172a0ad59
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthPainter.h
@@ -0,0 +1,156 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthPainter__
+#define __javax_swing_plaf_synth_SynthPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthContext;
+            class SynthPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthPainter : public ::java::lang::Object
+{
+
+public:
+  SynthPainter();
+  virtual void paintArrowButtonForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintProgressBarForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSeparatorForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSplitPaneDividerForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSplitPaneDragDivider(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTreeCellFocus(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintArrowButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintArrowButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintColorChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintColorChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintComboBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintComboBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopIconBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopIconBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintEditorPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintEditorPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFileChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFileChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFormattedTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFormattedTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameTitlePaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameTitlePaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintLabelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintLabelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintListBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintListBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintOptionPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintOptionPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPanelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPanelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPasswordFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPasswordFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPopupMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPopupMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintProgressBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintProgressBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRootPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRootPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintScrollBarThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintScrollBarTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSeparatorBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSeparatorBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSliderThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSliderTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSpinnerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSpinnerBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneDividerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTableBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableHeaderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableHeaderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToggleButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToggleButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarDragWindowBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarDragWindowBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolTipBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolTipBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeCellBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeCellBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintViewportBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintViewportBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthPainter__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyle.h b/libjava/javax/swing/plaf/synth/SynthStyle.h
new file mode 100644
index 00000000000..b8779f2b394
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthStyle.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthStyle__
+#define __javax_swing_plaf_synth_SynthStyle__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class ColorType;
+            class SynthContext;
+            class SynthGraphicsUtils;
+            class SynthPainter;
+            class SynthStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthStyle : public ::java::lang::Object
+{
+
+public:
+  SynthStyle();
+  virtual ::javax::swing::plaf::synth::SynthGraphicsUtils * getGraphicsUtils(::javax::swing::plaf::synth::SynthContext *);
+  virtual ::java::awt::Color * getColor(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *);
+public: // actually protected
+  virtual ::java::awt::Color * getColorForState(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *) = 0;
+public:
+  virtual ::java::awt::Font * getFont(::javax::swing::plaf::synth::SynthContext *);
+public: // actually protected
+  virtual ::java::awt::Font * getFontForState(::javax::swing::plaf::synth::SynthContext *) = 0;
+public:
+  virtual ::java::awt::Insets * getInsets(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Insets *);
+  virtual ::javax::swing::plaf::synth::SynthPainter * getPainter(::javax::swing::plaf::synth::SynthContext *);
+  virtual jboolean isOpaque(::javax::swing::plaf::synth::SynthContext *);
+  virtual ::java::lang::Object * get(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
+  virtual void installDefaults(::javax::swing::plaf::synth::SynthContext *);
+  virtual void uninstallDefaults(::javax::swing::plaf::synth::SynthContext *);
+  virtual jint getInt(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jint);
+  virtual jboolean getBoolean(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jboolean);
+  virtual ::javax::swing::Icon * getIcon(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
+  virtual ::java::lang::String * getString(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthStyle__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
new file mode 100644
index 00000000000..2f6905676a7
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthStyleFactory__
+#define __javax_swing_plaf_synth_SynthStyleFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+            class SynthStyle;
+            class SynthStyleFactory;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthStyleFactory : public ::java::lang::Object
+{
+
+public:
+  SynthStyleFactory();
+  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthStyleFactory__