From 07b78716af6a9d7c9fd1e94d9baf94a52c873947 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Fri, 30 Sep 2016 16:24:48 +0000
Subject: Makefile.def: Remove libjava.

2016-09-30  Andrew Haley  <aph@redhat.com>

	* Makefile.def: Remove libjava.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerate.
	* configure.ac: Likewise.
	* configure: Likewise.
	* gcc/java: Remove.
	* libjava: Likewise.

From-SVN: r240662
---
 libjava/javax/swing/plaf/basic/BasicArrowButton.h  |  65 -----
 .../swing/plaf/basic/BasicBorders$ButtonBorder.h   |  56 -----
 .../swing/plaf/basic/BasicBorders$FieldBorder.h    |  56 -----
 .../swing/plaf/basic/BasicBorders$MarginBorder.h   |  48 ----
 .../swing/plaf/basic/BasicBorders$MenuBarBorder.h  |  54 ----
 .../plaf/basic/BasicBorders$RadioButtonBorder.h    |  51 ----
 .../plaf/basic/BasicBorders$RolloverButtonBorder.h |  48 ----
 .../plaf/basic/BasicBorders$SplitPaneBorder.h      |  61 -----
 .../basic/BasicBorders$SplitPaneDividerBorder.h    |  51 ----
 .../plaf/basic/BasicBorders$ToggleButtonBorder.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicBorders.h      |  54 ----
 .../javax/swing/plaf/basic/BasicButtonListener$1.h |  51 ----
 .../javax/swing/plaf/basic/BasicButtonListener$2.h |  51 ----
 .../plaf/basic/BasicButtonListener$ButtonAction.h  |  54 ----
 .../javax/swing/plaf/basic/BasicButtonListener.h   |  76 ------
 libjava/javax/swing/plaf/basic/BasicButtonUI.h     |  96 -------
 .../swing/plaf/basic/BasicCheckBoxMenuItemUI.h     |  57 -----
 libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h   |  39 ---
 .../javax/swing/plaf/basic/BasicColorChooserUI$1.h |  45 ----
 .../basic/BasicColorChooserUI$PreviewListener.h    |  45 ----
 .../basic/BasicColorChooserUI$PropertyHandler.h    |  47 ----
 .../basic/BasicColorChooserUI$TabPaneListener.h    |  45 ----
 .../javax/swing/plaf/basic/BasicColorChooserUI.h   |  89 -------
 .../plaf/basic/BasicComboBoxEditor$UIResource.h    |  35 ---
 .../javax/swing/plaf/basic/BasicComboBoxEditor.h   |  59 -----
 .../plaf/basic/BasicComboBoxRenderer$UIResource.h  |  35 ---
 .../javax/swing/plaf/basic/BasicComboBoxRenderer.h |  53 ----
 .../basic/BasicComboBoxUI$ComboBoxLayoutManager.h  |  53 ----
 .../plaf/basic/BasicComboBoxUI$FocusHandler.h      |  51 ----
 .../swing/plaf/basic/BasicComboBoxUI$ItemHandler.h |  50 ----
 .../swing/plaf/basic/BasicComboBoxUI$KeyHandler.h  |  50 ----
 .../plaf/basic/BasicComboBoxUI$ListDataHandler.h   |  46 ----
 .../basic/BasicComboBoxUI$PropertyChangeHandler.h  |  47 ----
 libjava/javax/swing/plaf/basic/BasicComboBoxUI.h   | 154 ------------
 .../basic/BasicComboPopup$InvocationKeyHandler.h   |  50 ----
 .../basic/BasicComboPopup$InvocationMouseHandler.h |  52 ----
 .../BasicComboPopup$InvocationMouseMotionHandler.h |  51 ----
 .../swing/plaf/basic/BasicComboPopup$ItemHandler.h |  51 ----
 .../plaf/basic/BasicComboPopup$ListDataHandler.h   |  46 ----
 .../plaf/basic/BasicComboPopup$ListMouseHandler.h  |  52 ----
 .../basic/BasicComboPopup$ListMouseMotionHandler.h |  51 ----
 .../basic/BasicComboPopup$ListSelectionHandler.h   |  45 ----
 .../basic/BasicComboPopup$PropertyChangeHandler.h  |  48 ----
 libjava/javax/swing/plaf/basic/BasicComboPopup.h   | 133 ----------
 .../javax/swing/plaf/basic/BasicDesktopIconUI$1.h  |  48 ----
 .../javax/swing/plaf/basic/BasicDesktopIconUI$2.h  |  51 ----
 .../plaf/basic/BasicDesktopIconUI$BoundButton.h    |  49 ----
 .../basic/BasicDesktopIconUI$DesktopIconBorder.h   |  56 -----
 ...sicDesktopIconUI$InternalFrameDefaultMenuIcon.h |  47 ----
 .../basic/BasicDesktopIconUI$MouseInputHandler.h   |  60 -----
 .../javax/swing/plaf/basic/BasicDesktopIconUI.h    |  90 -------
 .../plaf/basic/BasicDesktopPaneUI$CloseAction.h    |  52 ----
 .../plaf/basic/BasicDesktopPaneUI$MaximizeAction.h |  52 ----
 .../plaf/basic/BasicDesktopPaneUI$MinimizeAction.h |  52 ----
 .../plaf/basic/BasicDesktopPaneUI$NavigateAction.h |  52 ----
 .../plaf/basic/BasicDesktopPaneUI$OpenAction.h     |  52 ----
 .../javax/swing/plaf/basic/BasicDesktopPaneUI.h    |  74 ------
 .../javax/swing/plaf/basic/BasicDirectoryModel$1.h |  41 ---
 ...yModel$DirectoryLoadThread$UpdateSwingRequest.h |  49 ----
 .../BasicDirectoryModel$DirectoryLoadThread.h      |  50 ----
 .../javax/swing/plaf/basic/BasicDirectoryModel.h   |  83 ------
 libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h |  47 ----
 .../basic/BasicFileChooserUI$AcceptAllFileFilter.h |  41 ---
 .../BasicFileChooserUI$ApproveSelectionAction.h    |  51 ----
 .../plaf/basic/BasicFileChooserUI$BasicFileView.h  |  50 ----
 .../BasicFileChooserUI$CancelSelectionAction.h     |  51 ----
 ...icFileChooserUI$ChangeToParentDirectoryAction.h |  51 ----
 .../basic/BasicFileChooserUI$DoubleClickListener.h |  55 ----
 .../plaf/basic/BasicFileChooserUI$GoHomeAction.h   |  51 ----
 .../basic/BasicFileChooserUI$NewFolderAction.h     |  51 ----
 .../basic/BasicFileChooserUI$SelectionListener.h   |  45 ----
 .../plaf/basic/BasicFileChooserUI$UpdateAction.h   |  51 ----
 .../javax/swing/plaf/basic/BasicFileChooserUI.h    | 187 --------------
 .../swing/plaf/basic/BasicFormattedTextFieldUI.h   |  41 ---
 .../javax/swing/plaf/basic/BasicGraphicsUtils.h    |  64 -----
 .../swing/plaf/basic/BasicHTML$HTMLRootView.h      |  87 -------
 libjava/javax/swing/plaf/basic/BasicHTML.h         |  45 ----
 .../javax/swing/plaf/basic/BasicIconFactory$1.h    |  47 ----
 .../javax/swing/plaf/basic/BasicIconFactory$2.h    |  47 ----
 .../plaf/basic/BasicIconFactory$CheckBoxIcon.h     |  47 ----
 .../basic/BasicIconFactory$CheckBoxMenuItemIcon.h  |  47 ----
 .../swing/plaf/basic/BasicIconFactory$DummyIcon.h  |  49 ----
 .../plaf/basic/BasicIconFactory$RadioButtonIcon.h  |  47 ----
 libjava/javax/swing/plaf/basic/BasicIconFactory.h  |  52 ----
 .../BasicInternalFrameTitlePane$CloseAction.h      |  50 ----
 .../BasicInternalFrameTitlePane$IconifyAction.h    |  50 ----
 .../BasicInternalFrameTitlePane$MaximizeAction.h   |  50 ----
 .../basic/BasicInternalFrameTitlePane$MoveAction.h |  50 ----
 .../basic/BasicInternalFrameTitlePane$PaneButton.h |  41 ---
 ...cInternalFrameTitlePane$PropertyChangeHandler.h |  47 ----
 .../BasicInternalFrameTitlePane$RestoreAction.h    |  50 ----
 .../basic/BasicInternalFrameTitlePane$SizeAction.h |  50 ----
 .../BasicInternalFrameTitlePane$SystemMenuBar.h    |  50 ----
 .../BasicInternalFrameTitlePane$TitlePaneLayout.h  |  53 ----
 .../swing/plaf/basic/BasicInternalFrameTitlePane.h | 110 --------
 ...sicInternalFrameUI$BasicInternalFrameListener.h |  51 ----
 .../basic/BasicInternalFrameUI$BorderListener.h    |  71 ------
 .../basic/BasicInternalFrameUI$ComponentHandler.h  |  54 ----
 .../BasicInternalFrameUI$GlassPaneDispatcher.h     |  65 -----
 .../BasicInternalFrameUI$InternalFrameBorder.h     |  54 ----
 .../BasicInternalFrameUI$InternalFrameLayout.h     |  56 -----
 ...alFrameUI$InternalFramePropertyChangeListener.h |  47 ----
 .../BasicInternalFrameUI$ShowSystemMenuAction.h    |  51 ----
 .../javax/swing/plaf/basic/BasicInternalFrameUI.h  | 139 ----------
 libjava/javax/swing/plaf/basic/BasicLabelUI$1.h    |  51 ----
 libjava/javax/swing/plaf/basic/BasicLabelUI.h      |  87 -------
 .../plaf/basic/BasicListUI$ActionListenerProxy.h   |  51 ----
 .../swing/plaf/basic/BasicListUI$FocusHandler.h    |  53 ----
 .../swing/plaf/basic/BasicListUI$ListAction.h      |  51 ----
 .../swing/plaf/basic/BasicListUI$ListDataHandler.h |  46 ----
 .../plaf/basic/BasicListUI$ListSelectionHandler.h  |  44 ----
 .../plaf/basic/BasicListUI$MouseInputHandler.h     |  56 -----
 .../plaf/basic/BasicListUI$PropertyChangeHandler.h |  47 ----
 libjava/javax/swing/plaf/basic/BasicListUI.h       | 128 ----------
 .../javax/swing/plaf/basic/BasicLookAndFeel$1.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$2.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$3.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$4.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$5.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$6.h    |  42 ----
 .../javax/swing/plaf/basic/BasicLookAndFeel$7.h    |  42 ----
 .../plaf/basic/BasicLookAndFeel$AudioAction.h      |  52 ----
 .../plaf/basic/BasicLookAndFeel$PopupHelper.h      |  54 ----
 libjava/javax/swing/plaf/basic/BasicLookAndFeel.h  |  63 -----
 .../plaf/basic/BasicMenuBarUI$ChangeHandler.h      |  45 ----
 .../plaf/basic/BasicMenuBarUI$ContainerHandler.h   |  52 ----
 .../swing/plaf/basic/BasicMenuBarUI$FocusAction.h  |  47 ----
 .../plaf/basic/BasicMenuBarUI$MouseInputHandler.h  |  57 -----
 .../basic/BasicMenuBarUI$PropertyChangeHandler.h   |  48 ----
 libjava/javax/swing/plaf/basic/BasicMenuBarUI.h    |  93 -------
 .../swing/plaf/basic/BasicMenuItemUI$ClickAction.h |  51 ----
 .../swing/plaf/basic/BasicMenuItemUI$ItemHandler.h |  51 ----
 .../basic/BasicMenuItemUI$MenuDragMouseHandler.h   |  48 ----
 .../plaf/basic/BasicMenuItemUI$MenuKeyHandler.h    |  47 ----
 .../plaf/basic/BasicMenuItemUI$MouseInputHandler.h |  57 -----
 .../basic/BasicMenuItemUI$PropertyChangeHandler.h  |  48 ----
 libjava/javax/swing/plaf/basic/BasicMenuItemUI.h   | 132 ----------
 .../swing/plaf/basic/BasicMenuUI$ChangeHandler.h   |  56 -----
 .../plaf/basic/BasicMenuUI$MenuDragMouseHandler.h  |  48 ----
 .../swing/plaf/basic/BasicMenuUI$MenuHandler.h     |  47 ----
 .../swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h  |  47 ----
 .../plaf/basic/BasicMenuUI$MouseInputHandler.h     |  60 -----
 .../plaf/basic/BasicMenuUI$SelectMenuAction.h      |  51 ----
 libjava/javax/swing/plaf/basic/BasicMenuUI.h       |  80 ------
 .../javax/swing/plaf/basic/BasicOptionPaneUI$1.h   |  45 ----
 .../javax/swing/plaf/basic/BasicOptionPaneUI$2.h   |  45 ----
 .../javax/swing/plaf/basic/BasicOptionPaneUI$3.h   |  45 ----
 .../javax/swing/plaf/basic/BasicOptionPaneUI$4.h   |  45 ----
 .../basic/BasicOptionPaneUI$ButtonActionListener.h |  52 ----
 .../basic/BasicOptionPaneUI$ButtonAreaLayout.h     |  66 -----
 .../plaf/basic/BasicOptionPaneUI$MessageIcon.h     |  49 ----
 .../BasicOptionPaneUI$OptionPaneCloseAction.h      |  47 ----
 .../BasicOptionPaneUI$PropertyChangeHandler.h      |  47 ----
 libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h | 148 -----------
 libjava/javax/swing/plaf/basic/BasicPanelUI.h      |  49 ----
 .../javax/swing/plaf/basic/BasicPasswordFieldUI.h  |  47 ----
 .../swing/plaf/basic/BasicPopupMenuSeparatorUI.h   |  48 ----
 .../plaf/basic/BasicPopupMenuUI$KeyboardHelper.h   |  65 -----
 .../plaf/basic/BasicPopupMenuUI$NavigateAction.h   |  64 -----
 .../plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h |  47 ----
 .../basic/BasicPopupMenuUI$TopWindowListener.h     |  54 ----
 libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h  |  90 -------
 .../basic/BasicProgressBarUI$AncestorHandler.h     |  47 ----
 .../swing/plaf/basic/BasicProgressBarUI$Animator.h |  51 ----
 .../plaf/basic/BasicProgressBarUI$ChangeHandler.h  |  44 ----
 .../basic/BasicProgressBarUI$ComponentHandler.h    |  51 ----
 .../BasicProgressBarUI$PropertyChangeHandler.h     |  48 ----
 .../javax/swing/plaf/basic/BasicProgressBarUI.h    | 123 ---------
 .../swing/plaf/basic/BasicRadioButtonMenuItemUI.h  |  57 -----
 .../javax/swing/plaf/basic/BasicRadioButtonUI.h    |  63 -----
 .../basic/BasicRootPaneUI$DefaultPressAction.h     |  54 ----
 .../basic/BasicRootPaneUI$DefaultReleaseAction.h   |  54 ----
 libjava/javax/swing/plaf/basic/BasicRootPaneUI.h   |  61 -----
 .../javax/swing/plaf/basic/BasicScrollBarUI$1.h    |  51 ----
 .../javax/swing/plaf/basic/BasicScrollBarUI$2.h    |  51 ----
 .../javax/swing/plaf/basic/BasicScrollBarUI$3.h    |  51 ----
 .../javax/swing/plaf/basic/BasicScrollBarUI$4.h    |  51 ----
 .../javax/swing/plaf/basic/BasicScrollBarUI$5.h    |  51 ----
 .../javax/swing/plaf/basic/BasicScrollBarUI$6.h    |  51 ----
 .../basic/BasicScrollBarUI$ArrowButtonListener.h   |  52 ----
 .../plaf/basic/BasicScrollBarUI$ModelListener.h    |  45 ----
 .../basic/BasicScrollBarUI$PropertyChangeHandler.h |  47 ----
 .../plaf/basic/BasicScrollBarUI$ScrollListener.h   |  56 -----
 .../plaf/basic/BasicScrollBarUI$TrackListener.h    |  60 -----
 libjava/javax/swing/plaf/basic/BasicScrollBarUI.h  | 174 -------------
 .../javax/swing/plaf/basic/BasicScrollPaneUI$1.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$10.h  |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$2.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$3.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$4.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$5.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$6.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$7.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$8.h   |  51 ----
 .../javax/swing/plaf/basic/BasicScrollPaneUI$9.h   |  51 ----
 .../basic/BasicScrollPaneUI$HSBChangeListener.h    |  44 ----
 .../basic/BasicScrollPaneUI$MouseWheelHandler.h    |  53 ----
 .../BasicScrollPaneUI$PropertyChangeHandler.h      |  47 ----
 .../basic/BasicScrollPaneUI$VSBChangeListener.h    |  44 ----
 .../BasicScrollPaneUI$ViewportChangeHandler.h      |  44 ----
 .../BasicScrollPaneUI$ViewportContainerListener.h  |  52 ----
 libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h | 108 --------
 libjava/javax/swing/plaf/basic/BasicSeparatorUI.h  |  64 -----
 libjava/javax/swing/plaf/basic/BasicSliderUI$1.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicSliderUI$2.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicSliderUI$3.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicSliderUI$4.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicSliderUI$5.h   |  51 ----
 libjava/javax/swing/plaf/basic/BasicSliderUI$6.h   |  51 ----
 .../plaf/basic/BasicSliderUI$ActionScroller.h      |  51 ----
 .../swing/plaf/basic/BasicSliderUI$ChangeHandler.h |  44 ----
 .../plaf/basic/BasicSliderUI$ComponentHandler.h    |  50 ----
 .../swing/plaf/basic/BasicSliderUI$FocusHandler.h  |  51 ----
 .../basic/BasicSliderUI$PropertyChangeHandler.h    |  47 ----
 .../plaf/basic/BasicSliderUI$ScrollListener.h      |  56 -----
 .../swing/plaf/basic/BasicSliderUI$TrackListener.h |  58 -----
 libjava/javax/swing/plaf/basic/BasicSliderUI.h     | 188 --------------
 libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h  |  48 ----
 libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h  |  56 -----
 libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h  |  51 ----
 libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h  |  56 -----
 libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h  |  51 ----
 .../basic/BasicSpinnerUI$DefaultLayoutManager.h    |  62 -----
 libjava/javax/swing/plaf/basic/BasicSpinnerUI.h    |  74 ------
 .../BasicSplitPaneDivider$BasicOneTouchButton.h    |  63 -----
 .../basic/BasicSplitPaneDivider$DividerLayout.h    |  54 ----
 .../basic/BasicSplitPaneDivider$DragController.h   |  58 -----
 .../basic/BasicSplitPaneDivider$MouseHandler.h     |  56 -----
 .../basic/BasicSplitPaneDivider$OneTouchAction.h   |  51 ----
 .../BasicSplitPaneDivider$VerticalDragController.h |  52 ----
 .../javax/swing/plaf/basic/BasicSplitPaneDivider.h |  97 -------
 .../javax/swing/plaf/basic/BasicSplitPaneUI$1.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$2.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$3.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$4.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$5.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$6.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$7.h    |  51 ----
 .../javax/swing/plaf/basic/BasicSplitPaneUI$8.h    |  51 ----
 ...BasicSplitPaneUI$BasicHorizontalLayoutManager.h |  88 -------
 .../BasicSplitPaneUI$BasicVerticalLayoutManager.h  |  39 ---
 .../plaf/basic/BasicSplitPaneUI$FocusHandler.h     |  51 ----
 .../BasicSplitPaneUI$KeyboardDownRightHandler.h    |  50 ----
 .../basic/BasicSplitPaneUI$KeyboardEndHandler.h    |  50 ----
 .../basic/BasicSplitPaneUI$KeyboardHomeHandler.h   |  50 ----
 .../BasicSplitPaneUI$KeyboardResizeToggleHandler.h |  50 ----
 .../basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h |  50 ----
 .../plaf/basic/BasicSplitPaneUI$PropertyHandler.h  |  47 ----
 libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h  | 149 -----------
 .../plaf/basic/BasicTabbedPaneUI$FocusHandler.h    |  51 ----
 .../plaf/basic/BasicTabbedPaneUI$MouseHandler.h    |  55 ----
 .../plaf/basic/BasicTabbedPaneUI$NavigateAction.h  |  50 ----
 .../BasicTabbedPaneUI$NavigatePageDownAction.h     |  46 ----
 .../basic/BasicTabbedPaneUI$NavigatePageUpAction.h |  46 ----
 .../BasicTabbedPaneUI$PropertyChangeHandler.h      |  47 ----
 .../basic/BasicTabbedPaneUI$RequestFocusAction.h   |  46 ----
 ...dPaneUI$RequestFocusForVisibleComponentAction.h |  46 ----
 .../plaf/basic/BasicTabbedPaneUI$ScrollingButton.h |  39 ---
 ...cTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h |  49 ----
 .../plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h  |  42 ----
 .../basic/BasicTabbedPaneUI$ScrollingViewport.h    |  39 ---
 .../basic/BasicTabbedPaneUI$TabSelectionHandler.h  |  44 ----
 .../basic/BasicTabbedPaneUI$TabbedPaneLayout.h     |  68 -----
 .../BasicTabbedPaneUI$TabbedPaneScrollLayout.h     |  56 -----
 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h | 223 ----------------
 .../javax/swing/plaf/basic/BasicTableHeaderUI$1.h  |  51 ----
 .../basic/BasicTableHeaderUI$MouseInputHandler.h   |  65 -----
 .../javax/swing/plaf/basic/BasicTableHeaderUI.h    |  92 -------
 .../swing/plaf/basic/BasicTableUI$FocusHandler.h   |  53 ----
 .../swing/plaf/basic/BasicTableUI$KeyHandler.h     |  52 ----
 .../plaf/basic/BasicTableUI$MouseInputHandler.h    |  62 -----
 .../basic/BasicTableUI$PropertyChangeHandler.h     |  48 ----
 .../swing/plaf/basic/BasicTableUI$TableAction.h    |  57 -----
 libjava/javax/swing/plaf/basic/BasicTableUI.h      | 112 ---------
 libjava/javax/swing/plaf/basic/BasicTextAreaUI.h   |  55 ----
 libjava/javax/swing/plaf/basic/BasicTextFieldUI.h  |  58 -----
 libjava/javax/swing/plaf/basic/BasicTextPaneUI.h   |  42 ----
 .../swing/plaf/basic/BasicTextUI$BasicCaret.h      |  35 ---
 .../plaf/basic/BasicTextUI$BasicHighlighter.h      |  35 ---
 .../swing/plaf/basic/BasicTextUI$FocusHandler.h    |  50 ----
 .../javax/swing/plaf/basic/BasicTextUI$Handler.h   |  55 ----
 .../javax/swing/plaf/basic/BasicTextUI$RootView.h  |  85 -------
 libjava/javax/swing/plaf/basic/BasicTextUI.h       | 137 ----------
 .../javax/swing/plaf/basic/BasicToggleButtonUI.h   |  54 ----
 .../swing/plaf/basic/BasicToolBarSeparatorUI.h     |  57 -----
 .../plaf/basic/BasicToolBarUI$DockingListener.h    |  62 -----
 .../swing/plaf/basic/BasicToolBarUI$DragWindow.h   |  60 -----
 .../plaf/basic/BasicToolBarUI$FrameListener.h      |  51 ----
 .../plaf/basic/BasicToolBarUI$PropertyListener.h   |  48 ----
 .../plaf/basic/BasicToolBarUI$ToolBarAction.h      |  50 ----
 .../plaf/basic/BasicToolBarUI$ToolBarBorder.h      |  55 ----
 .../basic/BasicToolBarUI$ToolBarContListener.h     |  52 ----
 .../plaf/basic/BasicToolBarUI$ToolBarDialog.h      |  39 ---
 .../basic/BasicToolBarUI$ToolBarFocusListener.h    |  52 ----
 libjava/javax/swing/plaf/basic/BasicToolBarUI.h    | 170 -------------
 .../basic/BasicToolTipUI$PropertyChangeHandler.h   |  48 ----
 libjava/javax/swing/plaf/basic/BasicToolTipUI.h    |  69 -----
 libjava/javax/swing/plaf/basic/BasicTreeUI$1.h     |  51 ----
 .../plaf/basic/BasicTreeUI$CellEditorHandler.h     |  45 ----
 .../plaf/basic/BasicTreeUI$ComponentHandler.h      |  62 -----
 .../swing/plaf/basic/BasicTreeUI$FocusHandler.h    |  52 ----
 .../swing/plaf/basic/BasicTreeUI$KeyHandler.h      |  59 -----
 .../swing/plaf/basic/BasicTreeUI$MouseHandler.h    |  56 -----
 .../plaf/basic/BasicTreeUI$MouseInputHandler.h     |  64 -----
 .../plaf/basic/BasicTreeUI$NodeDimensionsHandler.h |  49 ----
 .../plaf/basic/BasicTreeUI$PropertyChangeHandler.h |  47 ----
 ...sicTreeUI$SelectionModelPropertyChangeHandler.h |  47 ----
 .../basic/BasicTreeUI$TreeCancelEditingAction.h    |  50 ----
 .../plaf/basic/BasicTreeUI$TreeExpansionHandler.h  |  45 ----
 .../swing/plaf/basic/BasicTreeUI$TreeHomeAction.h  |  53 ----
 .../plaf/basic/BasicTreeUI$TreeIncrementAction.h   |  53 ----
 .../plaf/basic/BasicTreeUI$TreeModelHandler.h      |  47 ----
 .../swing/plaf/basic/BasicTreeUI$TreePageAction.h  |  53 ----
 .../plaf/basic/BasicTreeUI$TreeSelectionHandler.h  |  44 ----
 .../basic/BasicTreeUI$TreeStartEditingAction.h     |  50 ----
 .../plaf/basic/BasicTreeUI$TreeToggleAction.h      |  51 ----
 .../plaf/basic/BasicTreeUI$TreeTraverseAction.h    |  53 ----
 libjava/javax/swing/plaf/basic/BasicTreeUI.h       | 279 ---------------------
 libjava/javax/swing/plaf/basic/BasicViewportUI.h   |  44 ----
 libjava/javax/swing/plaf/basic/ComboPopup.h        |  55 ----
 libjava/javax/swing/plaf/basic/DefaultMenuLayout.h |  44 ----
 libjava/javax/swing/plaf/basic/SharedUIDefaults.h  |  48 ----
 322 files changed, 18778 deletions(-)
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicArrowButton.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicBorders.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicButtonListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicButtonUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicComboPopup.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicHTML.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicIconFactory.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLabelUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicListUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicMenuUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPanelUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSliderUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTableUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTextUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolBarUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicToolTipUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicTreeUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/BasicViewportUI.h
 delete mode 100644 libjava/javax/swing/plaf/basic/ComboPopup.h
 delete mode 100644 libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
 delete mode 100644 libjava/javax/swing/plaf/basic/SharedUIDefaults.h

(limited to 'libjava/javax/swing/plaf/basic')

diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.h b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
deleted file mode 100644
index 033f499..0000000
--- a/libjava/javax/swing/plaf/basic/BasicArrowButton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// 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
deleted file mode 100644
index b4a2c91..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 455b711..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index a974a46..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index fcf26ba..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index b737890..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 84d6ee0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 3a7d22f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// 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
deleted file mode 100644
index 90a8946..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 73d1f1c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index e32e2b2..0000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 85f3a16..0000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index fe6dd49..0000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 6e08aa4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 8b7cd51..0000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// 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
deleted file mode 100644
index c7209c0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonUI.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// 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
deleted file mode 100644
index 68f69f5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index ca6b44b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// 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
deleted file mode 100644
index af943a6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index a7c3a27..0000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index ed5743f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 3ca157f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index 83a41b0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// 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
deleted file mode 100644
index 36a4682..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// 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
deleted file mode 100644
index 5bde099..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// 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
deleted file mode 100644
index 76eaa5c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// 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
deleted file mode 100644
index 746cf3c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index e907fe2..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index e5f84c1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index e07a464..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index b2657b8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 8647c7f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index 987d540..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 77f1f53..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
+++ /dev/null
@@ -1,154 +0,0 @@
-
-// 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
deleted file mode 100644
index ecf7e1b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index b04fb47..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index b8c7bae..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 017c66b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index d7924a4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index 84b7488..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index d772569..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index dd3caad..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index 5bff9aa..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 7dfc525..0000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// 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 uninstallListListeners();
-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
deleted file mode 100644
index 1be1e4c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index cfa445f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 7a67871..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index cfce738..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 4a53e9a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 0829e1f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// 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
deleted file mode 100644
index bafff1a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// 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
deleted file mode 100644
index da7e843..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 2733cec..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index c834c71..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index b327f1c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 0fc733b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index c67ca08..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// 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
deleted file mode 100644
index a9daf9b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// 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:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index a5d2a71..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index d20f830..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index f13550f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// 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
deleted file mode 100644
index b0033ed..0000000
--- a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 72434cc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// 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
deleted file mode 100644
index b650369..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index dece5a2..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 03af702..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 75b99b5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 79df992..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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
deleted file mode 100644
index 219143e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index da249e4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index af8c2d0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index a3db6b1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 8565a67..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-// 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
deleted file mode 100644
index f024fbb..0000000
--- a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// 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
deleted file mode 100644
index 5cab989..0000000
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// 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
deleted file mode 100644
index 368ab87..0000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// 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
deleted file mode 100644
index 7ae8595..0000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index f15f5b9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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:
-  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$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
deleted file mode 100644
index 4b97c6d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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:
-  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$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
deleted file mode 100644
index 0287f1c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 9c1d7f0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index d777190..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index a30f4d0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index fc85137..0000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index efce70e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 4ed9a7f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index cf31b3c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 6c4570f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 3177afe..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// 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
deleted file mode 100644
index be7bb8b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index b33c5e0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index edf1553..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 9510859..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 4dedb42..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 68b826b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// 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
deleted file mode 100644
index d1d3664..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 18a50e6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// 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
deleted file mode 100644
index aeedc935..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 2452902..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// 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
deleted file mode 100644
index a5ddab0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 6ff8ae9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index c1a37ba..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 9b43d26..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 18aa920..0000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// 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
deleted file mode 100644
index e300451..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 5c67114..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// 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 Insets;
-        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 *);
-private:
-  ::java::awt::FontMetrics * getFontMetrics(::javax::swing::JLabel *);
-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;
-  ::java::awt::Insets * cachedInsets;
-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
deleted file mode 100644
index 48cfc19..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index a79c2a9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 0cec9aa..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index f0c6a15..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index 8211c69..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index deb7b58..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 8993d1b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 2d0d79d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// 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
deleted file mode 100644
index 19b3df5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 4abad03..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 9067d73..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index b92945c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index f87f80e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 9271f96..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 9b78750..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  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
deleted file mode 100644
index 0227ab3..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 0311899..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 13b4ada..0000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// 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
deleted file mode 100644
index 106c4d9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index fe9e681..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index b1882e1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 80b2793..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index 0365962..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 27b85de..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// 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
deleted file mode 100644
index ffdf967..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index f2746bf..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 775a4f7..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index db70c21..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 6f735f3..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index 203bd65..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index c602c23..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// 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
deleted file mode 100644
index 44eeca1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 39cc8f9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index eb51916..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index be2f9ca..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index c5e1e40..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// 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
deleted file mode 100644
index 9781577..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index d3ae59e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// 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
deleted file mode 100644
index 644bb97..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index 81a3757..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index febfc6b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index 313bc76..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index 575b2b7..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 06671dd..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// 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
deleted file mode 100644
index a820f3c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index 81dcc99..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 02b236c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 50aa3b4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// 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
deleted file mode 100644
index 5fcf6fe..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index fcbb873..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index d5082f9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 5fb0407..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// 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
deleted file mode 100644
index 03fb5ac..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// 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
deleted file mode 100644
index 3b8b580..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index e88a2f8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 95bf37a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// 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
deleted file mode 100644
index 54768d3..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 31c00bc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index e829662..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index 2f20e0f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 9d0d136..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 85263b9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
+++ /dev/null
@@ -1,123 +0,0 @@
-
-// 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
deleted file mode 100644
index 5439b67..0000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index deea385..0000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// 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 *);
-private:
-  ::javax::swing::Icon * getCurrentIcon(::javax::swing::AbstractButton *);
-public:
-  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
deleted file mode 100644
index 040c915..0000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 1728960..0000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index cf222b7..0000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// 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
deleted file mode 100644
index cd9673d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 2d4479a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index ef2fcc6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 112745e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 7fa7223..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 23da9c5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 85d9429..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 472d5bd..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index b2afd71..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 193e13f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index b78648a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// 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
deleted file mode 100644
index 64cd923..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// 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
deleted file mode 100644
index 2a73428..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 6e11299..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 672b715..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index f69a224..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 9fabcaa..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 22fb657..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index f3d5560..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index b8c2c95..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index f68cfa1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 246c7d9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index b4cd055..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index 33a3deb..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index d41feb6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 53c4f80..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index abbdc71..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index d0ca243..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index c06cf93..0000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// 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
deleted file mode 100644
index f16b625..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// 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
deleted file mode 100644
index 6f0c346..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
deleted file mode 100644
index ddf707d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
deleted file mode 100644
index 0e223c5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
deleted file mode 100644
index 79205db..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
deleted file mode 100644
index 824428b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
deleted file mode 100644
index 5e42ccc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  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$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
deleted file mode 100644
index 739b384..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index ee9305b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index f192a5b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index bc91028..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index b038237..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 0032d49..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 1d6bda1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// 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
deleted file mode 100644
index cb35faa..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI.h
+++ /dev/null
@@ -1,188 +0,0 @@
-
-// 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
deleted file mode 100644
index f303a6e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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:
-  virtual 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
deleted file mode 100644
index 9d8f204..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void increment();
-  jboolean volatile __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
deleted file mode 100644
index 84849e2..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  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
deleted file mode 100644
index 3ec6936..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void decrement();
-  jboolean volatile __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
deleted file mode 100644
index 094cc9a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$4 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  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
deleted file mode 100644
index 552ee52..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// 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
deleted file mode 100644
index aa148b7..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// 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
deleted file mode 100644
index cd51091..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// 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
deleted file mode 100644
index 418b6dc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index 902a572..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// 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
deleted file mode 100644
index bafbfee..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index bc15385..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index cc1a149..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index a4c51fc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// 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
deleted file mode 100644
index 16005e6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 9fea0b4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 70833ad..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index a1bf351..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 9dc822f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 8b182f1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 517b5a0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 88213ff..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  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
deleted file mode 100644
index 7f3b393..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// 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
deleted file mode 100644
index 47f78ce..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// 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
deleted file mode 100644
index a338ae8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 439de5c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 4b474d9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 755d657..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 34e9acd..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index ce00ebc..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 87f023b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index fdbcb15..0000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
+++ /dev/null
@@ -1,149 +0,0 @@
-
-// 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
deleted file mode 100644
index 4545f10..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index c36fc50..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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
deleted file mode 100644
index 17596c2..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 52e7e35..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index c5195af..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index 09e568f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 1ee8f72..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index cbb776a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// 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
deleted file mode 100644
index 895072d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// 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
deleted file mode 100644
index d896ca0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index 4c1d483..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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
deleted file mode 100644
index 2469bbe..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// 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
deleted file mode 100644
index ad26176..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index a56abd9..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// 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
deleted file mode 100644
index 87642f7..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index a20eedb..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
+++ /dev/null
@@ -1,223 +0,0 @@
-
-// 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
deleted file mode 100644
index 1e23475..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  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
deleted file mode 100644
index 379f3ac..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// 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
deleted file mode 100644
index 4a31c13..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// 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
deleted file mode 100644
index e7ff31e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index f70e6d3..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index a0fb583..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// 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
deleted file mode 100644
index e51aad5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index 44a245c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index 6abd88f..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// 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
deleted file mode 100644
index c05b92a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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
deleted file mode 100644
index be9a77c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// 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
deleted file mode 100644
index 62d9deb..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// 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$BasicCaret.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
deleted file mode 100644
index c89238e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// 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
deleted file mode 100644
index 657f780..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// 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$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
deleted file mode 100644
index 0526788..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index a8ca57b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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$RootView.h b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
deleted file mode 100644
index 3304459..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// 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
deleted file mode 100644
index f96f133..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-// 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
deleted file mode 100644
index 45a7734..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// 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
deleted file mode 100644
index a277f32..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// 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
deleted file mode 100644
index 3651114..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// 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
deleted file mode 100644
index 0545be0..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// 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
deleted file mode 100644
index 6041d74..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 39dafa8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index ff10a58..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index bcdc537..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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
deleted file mode 100644
index 0b5d669..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index b7ee7b8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// 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
deleted file mode 100644
index 4b5f7de..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 3b3c149..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
+++ /dev/null
@@ -1,170 +0,0 @@
-
-// 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
deleted file mode 100644
index 9bc19d1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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
deleted file mode 100644
index a204e00..0000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// 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
deleted file mode 100644
index 3578f47..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
deleted file mode 100644
index 07bc329..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index ec6d818..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// 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
deleted file mode 100644
index 232e989..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// 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
deleted file mode 100644
index 2be990a..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// 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
deleted file mode 100644
index 2a0893b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// 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
deleted file mode 100644
index 574d8b5..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// 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
deleted file mode 100644
index 352a370..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// 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
deleted file mode 100644
index 54386de..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 52b52d1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index b64ba69..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 52ba7c8..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 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
deleted file mode 100644
index 1b25c11..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 03ed852..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 9ea5268..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// 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
deleted file mode 100644
index 5cb1725..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 73ff33b..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index fa01f97..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// 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
deleted file mode 100644
index 59b5c5e..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// 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
deleted file mode 100644
index 617dbd6..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// 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
deleted file mode 100644
index 42159f1..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.h
+++ /dev/null
@@ -1,279 +0,0 @@
-
-// 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;
-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
deleted file mode 100644
index f657f7d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicViewportUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index 9f01bed..0000000
--- a/libjava/javax/swing/plaf/basic/ComboPopup.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// 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
deleted file mode 100644
index 15b06f2..0000000
--- a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// 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
deleted file mode 100644
index 7db5a2f..0000000
--- a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// 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__
-- 
cgit v1.1