summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/awt
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
commit45e7a5b78c29ebc5bd43ba65d1b02cb4457be613 (patch)
treee35eb3316b7f97bf0126b74d8816fdaabbc727e8 /offapi/com/sun/star/awt
parent3ab3374ed3863c7c6e329c56aabec31d6c908656 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/awt')
-rw-r--r--offapi/com/sun/star/awt/AccessibleButton.idl14
-rw-r--r--offapi/com/sun/star/awt/AccessibleCheckBox.idl14
-rw-r--r--offapi/com/sun/star/awt/AccessibleComboBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleDropDownListBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleEdit.idl12
-rw-r--r--offapi/com/sun/star/awt/AccessibleFixedText.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleList.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleListBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleListBoxList.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleListItem.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenu.idl16
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuBar.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuItem.idl14
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuSeparator.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessiblePopupMenu.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleRadioButton.idl14
-rw-r--r--offapi/com/sun/star/awt/AccessibleScrollBar.idl12
-rw-r--r--offapi/com/sun/star/awt/AccessibleStatusBar.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleStatusBarItem.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBar.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBarPage.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBarPageList.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabControl.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabPage.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleTextField.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleToolBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleToolBoxItem.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTreeListBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleWindow.idl8
-rw-r--r--offapi/com/sun/star/awt/ActionEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/AdjustmentEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/AsyncCallback.idl2
-rw-r--r--offapi/com/sun/star/awt/ContainerWindowProvider.idl5
-rw-r--r--offapi/com/sun/star/awt/DialogProvider.idl5
-rw-r--r--offapi/com/sun/star/awt/DialogProvider2.idl5
-rw-r--r--offapi/com/sun/star/awt/DockingData.idl2
-rw-r--r--offapi/com/sun/star/awt/DockingEvent.idl6
-rw-r--r--offapi/com/sun/star/awt/EndDockingEvent.idl5
-rw-r--r--offapi/com/sun/star/awt/EndPopupModeEvent.idl5
-rw-r--r--offapi/com/sun/star/awt/EnhancedMouseEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/FocusEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/FontDescriptor.idl2
-rw-r--r--offapi/com/sun/star/awt/Gradient.idl4
-rw-r--r--offapi/com/sun/star/awt/InputEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/ItemEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/KeyEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/MaxChildrenException.idl2
-rw-r--r--offapi/com/sun/star/awt/MenuBar.idl2
-rw-r--r--offapi/com/sun/star/awt/MenuEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/MenuLogo.idl5
-rw-r--r--offapi/com/sun/star/awt/MouseEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/PaintEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/PopupMenu.idl2
-rw-r--r--offapi/com/sun/star/awt/PrinterException.idl2
-rw-r--r--offapi/com/sun/star/awt/SpinEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/TabController.idl2
-rw-r--r--offapi/com/sun/star/awt/TabControllerModel.idl5
-rw-r--r--offapi/com/sun/star/awt/TextEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/Toolkit.idl11
-rw-r--r--offapi/com/sun/star/awt/UnoControl.idl14
-rw-r--r--offapi/com/sun/star/awt/UnoControlButton.idl6
-rw-r--r--offapi/com/sun/star/awt/UnoControlButtonModel.idl10
-rw-r--r--offapi/com/sun/star/awt/UnoControlCheckBox.idl7
-rw-r--r--offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl10
-rw-r--r--offapi/com/sun/star/awt/UnoControlComboBox.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlComboBoxModel.idl7
-rw-r--r--offapi/com/sun/star/awt/UnoControlContainer.idl11
-rw-r--r--offapi/com/sun/star/awt/UnoControlContainerModel.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlCurrencyField.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlDateField.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlDateFieldModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlDialog.idl6
-rw-r--r--offapi/com/sun/star/awt/UnoControlDialogModel.idl19
-rw-r--r--offapi/com/sun/star/awt/UnoControlEdit.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlEditModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlFileControl.idl2
-rw-r--r--offapi/com/sun/star/awt/UnoControlFileControlModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl11
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedLine.idl2
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedLineModel.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedText.idl6
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedTextModel.idl11
-rw-r--r--offapi/com/sun/star/awt/UnoControlFormattedField.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl14
-rw-r--r--offapi/com/sun/star/awt/UnoControlGroupBox.idl2
-rw-r--r--offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl7
-rw-r--r--offapi/com/sun/star/awt/UnoControlImageControl.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlImageControlModel.idl6
-rw-r--r--offapi/com/sun/star/awt/UnoControlListBox.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlListBoxModel.idl10
-rw-r--r--offapi/com/sun/star/awt/UnoControlModel.idl15
-rw-r--r--offapi/com/sun/star/awt/UnoControlNumericField.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlPatternField.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl9
-rw-r--r--offapi/com/sun/star/awt/UnoControlProgressBar.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlProgressBarModel.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlRadioButton.idl7
-rw-r--r--offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl10
-rw-r--r--offapi/com/sun/star/awt/UnoControlRoadmap.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlRoadmapModel.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlScrollBar.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlScrollBarModel.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl2
-rw-r--r--offapi/com/sun/star/awt/UnoControlSpinButton.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlThrobber.idl5
-rw-r--r--offapi/com/sun/star/awt/UnoControlThrobberModel.idl2
-rw-r--r--offapi/com/sun/star/awt/UnoControlTimeField.idl8
-rw-r--r--offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl9
-rw-r--r--offapi/com/sun/star/awt/VclContainerEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/WindowDescriptor.idl6
-rw-r--r--offapi/com/sun/star/awt/WindowEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/XActionListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XActivateListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XAdjustmentListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XBitmap.idl4
-rw-r--r--offapi/com/sun/star/awt/XButton.idl4
-rw-r--r--offapi/com/sun/star/awt/XCallback.idl2
-rw-r--r--offapi/com/sun/star/awt/XCheckBox.idl4
-rw-r--r--offapi/com/sun/star/awt/XComboBox.idl6
-rw-r--r--offapi/com/sun/star/awt/XContainerWindowEventHandler.idl6
-rw-r--r--offapi/com/sun/star/awt/XContainerWindowProvider.idl6
-rw-r--r--offapi/com/sun/star/awt/XControl.idl12
-rw-r--r--offapi/com/sun/star/awt/XControlContainer.idl4
-rw-r--r--offapi/com/sun/star/awt/XControlModel.idl2
-rw-r--r--offapi/com/sun/star/awt/XCurrencyField.idl2
-rw-r--r--offapi/com/sun/star/awt/XDataTransferProviderAccess.idl2
-rw-r--r--offapi/com/sun/star/awt/XDateField.idl2
-rw-r--r--offapi/com/sun/star/awt/XDevice.idl6
-rw-r--r--offapi/com/sun/star/awt/XDialog.idl2
-rw-r--r--offapi/com/sun/star/awt/XDialog2.idl2
-rw-r--r--offapi/com/sun/star/awt/XDialogEventHandler.idl6
-rw-r--r--offapi/com/sun/star/awt/XDialogProvider.idl6
-rw-r--r--offapi/com/sun/star/awt/XDialogProvider2.idl4
-rw-r--r--offapi/com/sun/star/awt/XDisplayBitmap.idl2
-rw-r--r--offapi/com/sun/star/awt/XDisplayConnection.idl2
-rw-r--r--offapi/com/sun/star/awt/XDockableWindow.idl8
-rw-r--r--offapi/com/sun/star/awt/XDockableWindowListener.idl12
-rw-r--r--offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl5
-rw-r--r--offapi/com/sun/star/awt/XEventHandler.idl2
-rw-r--r--offapi/com/sun/star/awt/XExtendedToolkit.idl17
-rw-r--r--offapi/com/sun/star/awt/XFileDialog.idl2
-rw-r--r--offapi/com/sun/star/awt/XFixedHyperlink.idl5
-rw-r--r--offapi/com/sun/star/awt/XFixedText.idl2
-rw-r--r--offapi/com/sun/star/awt/XFocusListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XFont.idl6
-rw-r--r--offapi/com/sun/star/awt/XFont2.idl2
-rw-r--r--offapi/com/sun/star/awt/XGraphics.idl13
-rw-r--r--offapi/com/sun/star/awt/XImageButton.idl4
-rw-r--r--offapi/com/sun/star/awt/XImageConsumer.idl2
-rw-r--r--offapi/com/sun/star/awt/XImageProducer.idl4
-rw-r--r--offapi/com/sun/star/awt/XInfoPrinter.idl4
-rw-r--r--offapi/com/sun/star/awt/XItemEventBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/awt/XItemListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XKeyHandler.idl4
-rw-r--r--offapi/com/sun/star/awt/XKeyListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XLayoutConstrains.idl4
-rw-r--r--offapi/com/sun/star/awt/XLayoutContainer.idl12
-rw-r--r--offapi/com/sun/star/awt/XLayoutRoot.idl6
-rw-r--r--offapi/com/sun/star/awt/XLayoutUnit.idl2
-rw-r--r--offapi/com/sun/star/awt/XListBox.idl6
-rw-r--r--offapi/com/sun/star/awt/XMenu.idl2
-rw-r--r--offapi/com/sun/star/awt/XMenuBar.idl2
-rw-r--r--offapi/com/sun/star/awt/XMenuBarExtended.idl11
-rw-r--r--offapi/com/sun/star/awt/XMenuExtended.idl2
-rw-r--r--offapi/com/sun/star/awt/XMenuExtended2.idl11
-rw-r--r--offapi/com/sun/star/awt/XMenuListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XMessageBox.idl2
-rw-r--r--offapi/com/sun/star/awt/XMessageBoxFactory.idl11
-rw-r--r--offapi/com/sun/star/awt/XMetricField.idl4
-rw-r--r--offapi/com/sun/star/awt/XMouseClickHandler.idl5
-rw-r--r--offapi/com/sun/star/awt/XMouseListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XMouseMotionHandler.idl4
-rw-r--r--offapi/com/sun/star/awt/XMouseMotionListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XNumericField.idl2
-rw-r--r--offapi/com/sun/star/awt/XPaintListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XPatternField.idl2
-rw-r--r--offapi/com/sun/star/awt/XPointer.idl2
-rw-r--r--offapi/com/sun/star/awt/XPopupMenu.idl4
-rw-r--r--offapi/com/sun/star/awt/XPopupMenuExtended.idl20
-rw-r--r--offapi/com/sun/star/awt/XPrinter.idl8
-rw-r--r--offapi/com/sun/star/awt/XPrinterPropertySet.idl6
-rw-r--r--offapi/com/sun/star/awt/XPrinterServer.idl6
-rw-r--r--offapi/com/sun/star/awt/XProgressBar.idl4
-rw-r--r--offapi/com/sun/star/awt/XProgressMonitor.idl2
-rw-r--r--offapi/com/sun/star/awt/XRadioButton.idl4
-rw-r--r--offapi/com/sun/star/awt/XRegion.idl4
-rw-r--r--offapi/com/sun/star/awt/XRequestCallback.idl2
-rw-r--r--offapi/com/sun/star/awt/XReschedule.idl2
-rw-r--r--offapi/com/sun/star/awt/XScrollBar.idl4
-rw-r--r--offapi/com/sun/star/awt/XSimpleAnimation.idl5
-rw-r--r--offapi/com/sun/star/awt/XSimpleTabController.idl11
-rw-r--r--offapi/com/sun/star/awt/XSpinField.idl4
-rw-r--r--offapi/com/sun/star/awt/XSpinListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XSpinValue.idl8
-rw-r--r--offapi/com/sun/star/awt/XSystemChildFactory.idl2
-rw-r--r--offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl2
-rw-r--r--offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl2
-rw-r--r--offapi/com/sun/star/awt/XTabController.idl8
-rw-r--r--offapi/com/sun/star/awt/XTabControllerModel.idl4
-rw-r--r--offapi/com/sun/star/awt/XTabListener.idl8
-rw-r--r--offapi/com/sun/star/awt/XTextArea.idl2
-rw-r--r--offapi/com/sun/star/awt/XTextComponent.idl6
-rw-r--r--offapi/com/sun/star/awt/XTextEditField.idl2
-rw-r--r--offapi/com/sun/star/awt/XTextLayoutConstrains.idl4
-rw-r--r--offapi/com/sun/star/awt/XTextListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XThrobber.idl5
-rw-r--r--offapi/com/sun/star/awt/XTimeField.idl2
-rw-r--r--offapi/com/sun/star/awt/XToggleButton.idl4
-rw-r--r--offapi/com/sun/star/awt/XToolkit.idl14
-rw-r--r--offapi/com/sun/star/awt/XTopWindow.idl6
-rw-r--r--offapi/com/sun/star/awt/XTopWindowListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XUnitConversion.idl11
-rw-r--r--offapi/com/sun/star/awt/XUnoControlContainer.idl4
-rw-r--r--offapi/com/sun/star/awt/XUserInputInterception.idl8
-rw-r--r--offapi/com/sun/star/awt/XVclContainer.idl6
-rw-r--r--offapi/com/sun/star/awt/XVclContainerListener.idl4
-rw-r--r--offapi/com/sun/star/awt/XVclContainerPeer.idl4
-rw-r--r--offapi/com/sun/star/awt/XVclWindowPeer.idl7
-rw-r--r--offapi/com/sun/star/awt/XView.idl6
-rw-r--r--offapi/com/sun/star/awt/XWindow.idl16
-rw-r--r--offapi/com/sun/star/awt/XWindow2.idl4
-rw-r--r--offapi/com/sun/star/awt/XWindowListener.idl6
-rw-r--r--offapi/com/sun/star/awt/XWindowListener2.idl2
-rw-r--r--offapi/com/sun/star/awt/XWindowPeer.idl7
-rw-r--r--offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/GridColumn.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/GridColumnEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/GridInvalidDataException.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/GridInvalidModelException.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/GridSelectionEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/UnoControlGrid.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/XGridColumnModel.idl1
-rw-r--r--offapi/com/sun/star/awt/grid/XGridDataListener.idl5
-rw-r--r--offapi/com/sun/star/awt/grid/XGridSelectionListener.idl4
-rw-r--r--offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl2
-rw-r--r--offapi/com/sun/star/awt/tree/ExpandVetoException.idl5
-rw-r--r--offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl5
-rw-r--r--offapi/com/sun/star/awt/tree/MutableTreeNode.idl2
-rw-r--r--offapi/com/sun/star/awt/tree/TreeControl.idl2
-rw-r--r--offapi/com/sun/star/awt/tree/TreeControlModel.idl8
-rw-r--r--offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl5
-rw-r--r--offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl5
-rw-r--r--offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl5
-rw-r--r--offapi/com/sun/star/awt/tree/XMutableTreeNode.idl7
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeControl.idl11
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeDataModel.idl11
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl4
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeEditListener.idl8
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl7
-rw-r--r--offapi/com/sun/star/awt/tree/XTreeNode.idl5
259 files changed, 0 insertions, 1449 deletions
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 16e35e2018ec..42a421305055 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -28,27 +28,13 @@
#ifndef __com_sun_star_awt_AccessibleButton_idl__
#define __com_sun_star_awt_AccessibleButton_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 1781f6543a77..50789d7868d7 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -28,27 +28,13 @@
#ifndef __com_sun_star_awt_AccessibleCheckBox_idl__
#define __com_sun_star_awt_AccessibleCheckBox_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 5e492724c10b..afefab3aeab1 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleComboBox_idl__
#define __com_sun_star_awt_AccessibleComboBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 01d8b7cb1c80..cf53bf03e4d6 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleDropDownComboBox_idl__
#define __com_sun_star_awt_AccessibleDropDownComboBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 2f3ca4989083..8984a0ad0d16 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleDropDownListBox_idl__
#define __com_sun_star_awt_AccessibleDropDownListBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 720b9204e14e..7b7b888e969b 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_awt_AccessibleEdit_idl__
#define __com_sun_star_awt_AccessibleEdit_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
#include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index bef95c95bfea..510d4c60c70f 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleFixedText_idl__
#define __com_sun_star_awt_AccessibleFixedText_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index a7f6a19bc4c3..0aecfb252cfa 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleIconChoiceControl_idl__
#define __com_sun_star_awt_AccessibleIconChoiceControl_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index 0b8cf1ef973d..eee2146e3cbb 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
#define __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 5e86d6102de1..31d9eded499f 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleList_idl__
#define __com_sun_star_awt_AccessibleList_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 282306d7c70f..0ad23576ed74 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleListBox_idl__
#define __com_sun_star_awt_AccessibleListBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index 4caba7202796..3d2111f6e9ea 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleListBoxList_idl__
#define __com_sun_star_awt_AccessibleListBoxList_idl__
-#ifndef __com_sun_star_awt_AccessibleList_idl__
#include <com/sun/star/awt/AccessibleList.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index 70020f0c2056..134e8ea2878a 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleListItem_idl__
#define __com_sun_star_awt_AccessibleListItem_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 5fa44c2a1da1..777819fdd177 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -28,30 +28,14 @@
#ifndef __com_sun_star_awt_AccessibleMenu_idl__
#define __com_sun_star_awt_AccessibleMenu_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index e001471b9149..b793bbf29ae1 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleMenuBar_idl__
#define __com_sun_star_awt_AccessibleMenuBar_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 3e78d067a01a..5423afcbd2c1 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -28,27 +28,13 @@
#ifndef __com_sun_star_awt_AccessibleMenuItem_idl__
#define __com_sun_star_awt_AccessibleMenuItem_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 582681ce043a..07bbff08db22 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_awt_AccessibleMenuSeparator_idl__
#define __com_sun_star_awt_AccessibleMenuSeparator_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index bdf286d047e2..8849166ee32e 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessiblePopupMenu_idl__
#define __com_sun_star_awt_AccessiblePopupMenu_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 94744ecc5301..cf1034606cb4 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -28,27 +28,13 @@
#ifndef __com_sun_star_awt_AccessibleRadioButton_idl__
#define __com_sun_star_awt_AccessibleRadioButton_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index d3337c737563..2ad2523e23eb 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_awt_AccessibleScrollBar_idl__
#define __com_sun_star_awt_AccessibleScrollBar_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index b3618150235e..270246a3b256 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_awt_AccessibleStatusBar_idl__
#define __com_sun_star_awt_AccessibleStatusBar_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index ceea05097428..e9b1258c9308 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleStatusBarItem_idl__
#define __com_sun_star_awt_AccessibleStatusBarItem_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 4e2bdceadb1c..5515178a9e7a 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_awt_AccessibleTabBar_idl__
#define __com_sun_star_awt_AccessibleTabBar_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index 3937066b6897..aa4bd88f1041 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_awt_AccessibleTabBarPage_idl__
#define __com_sun_star_awt_AccessibleTabBarPage_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 80bceb661f9c..fbd1017d3612 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleTabBarPageList_idl__
#define __com_sun_star_awt_AccessibleTabBarPageList_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index 09b1f6b91efa..7d1e6c820996 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleTabControl_idl__
#define __com_sun_star_awt_AccessibleTabControl_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 061024b62fc8..62116f3f38a9 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_awt_AccessibleTabPage_idl__
#define __com_sun_star_awt_AccessibleTabPage_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 65c422e7e604..4a4d4428aa6b 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_AccessibleTextField_idl__
#define __com_sun_star_accessibility_AccessibleTextField_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index b86003badf17..613e7ddfbb10 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_AccessibleToolBox_idl__
#define __com_sun_star_accessibility_AccessibleToolBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index b2aafcd4be47..3289f6b6dea0 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleToolBoxItem_idl__
#define __com_sun_star_awt_AccessibleToolBoxItem_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index 31bcf6865cee..38f5c795e785 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleTreeListBox_idl__
#define __com_sun_star_awt_AccessibleTreeListBox_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index cec5b4d3819d..df418cd1cfe4 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
#define __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 59ae5bf25c28..28020aaf033b 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_awt_AccessibleWindow_idl__
#define __com_sun_star_awt_AccessibleWindow_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/ActionEvent.idl b/offapi/com/sun/star/awt/ActionEvent.idl
index 29cf1ab2e65b..30bcf8a3db8b 100644
--- a/offapi/com/sun/star/awt/ActionEvent.idl
+++ b/offapi/com/sun/star/awt/ActionEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_ActionEvent_idl__
#define __com_sun_star_awt_ActionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/AdjustmentEvent.idl b/offapi/com/sun/star/awt/AdjustmentEvent.idl
index e2835a239529..6ee16453d68c 100644
--- a/offapi/com/sun/star/awt/AdjustmentEvent.idl
+++ b/offapi/com/sun/star/awt/AdjustmentEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_AdjustmentEvent_idl__
#define __com_sun_star_awt_AdjustmentEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_awt_AdjustmentType_idl__
#include <com/sun/star/awt/AdjustmentType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/AsyncCallback.idl b/offapi/com/sun/star/awt/AsyncCallback.idl
index 6c1d9feef993..c65ebf8e966b 100644
--- a/offapi/com/sun/star/awt/AsyncCallback.idl
+++ b/offapi/com/sun/star/awt/AsyncCallback.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_AsyncCallback_idl__
#define __com_sun_star_awt_AsyncCallback_idl__
-#ifndef __com_sun_star_awt_XRequestCallback_idl__
#include <com/sun/star/awt/XRequestCallback.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/ContainerWindowProvider.idl b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
index 74bc62d11b56..985a00c79c15 100644
--- a/offapi/com/sun/star/awt/ContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_awt_ContainerWindowProvider_idl__
#define __com_sun_star_awt_ContainerWindowProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
#include <com/sun/star/awt/XContainerWindowProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/DialogProvider.idl b/offapi/com/sun/star/awt/DialogProvider.idl
index 863a107755d6..d48a43e7d4a1 100644
--- a/offapi/com/sun/star/awt/DialogProvider.idl
+++ b/offapi/com/sun/star/awt/DialogProvider.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_awt_DialogProvider_idl__
#define __com_sun_star_awt_DialogProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
#include <com/sun/star/awt/XDialogProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/DialogProvider2.idl b/offapi/com/sun/star/awt/DialogProvider2.idl
index be0db00bf859..815a42770875 100644
--- a/offapi/com/sun/star/awt/DialogProvider2.idl
+++ b/offapi/com/sun/star/awt/DialogProvider2.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_awt_DialogProvider2_idl__
#define __com_sun_star_awt_DialogProvider2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider2_idl__
#include <com/sun/star/awt/XDialogProvider2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/DockingData.idl b/offapi/com/sun/star/awt/DockingData.idl
index ec470b193063..469e41148156 100644
--- a/offapi/com/sun/star/awt/DockingData.idl
+++ b/offapi/com/sun/star/awt/DockingData.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_DockingData_idl__
#define __com_sun_star_awt_DockingData_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/DockingEvent.idl b/offapi/com/sun/star/awt/DockingEvent.idl
index b6182c48ee2e..210e867b28db 100644
--- a/offapi/com/sun/star/awt/DockingEvent.idl
+++ b/offapi/com/sun/star/awt/DockingEvent.idl
@@ -27,16 +27,10 @@
#ifndef __com_sun_star_awt_DockingEvent_idl__
#define __com_sun_star_awt_DockingEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/EndDockingEvent.idl b/offapi/com/sun/star/awt/EndDockingEvent.idl
index d5efcdccb648..4099dbc9d2b6 100644
--- a/offapi/com/sun/star/awt/EndDockingEvent.idl
+++ b/offapi/com/sun/star/awt/EndDockingEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_EndDockingEvent_idl__
#define __com_sun_star_awt_EndDockingEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/EndPopupModeEvent.idl b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
index 77aa218f5f1c..8ce795183afa 100644
--- a/offapi/com/sun/star/awt/EndPopupModeEvent.idl
+++ b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
#define __com_sun_star_awt_EndPopupModeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
index 99f0ee3c8b01..4eb2a9de1795 100644
--- a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
+++ b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
#define __com_sun_star_awt_EnhancedMouseEvent_idl__
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/FocusEvent.idl b/offapi/com/sun/star/awt/FocusEvent.idl
index 8671d156423e..1f803a2d2cb6 100644
--- a/offapi/com/sun/star/awt/FocusEvent.idl
+++ b/offapi/com/sun/star/awt/FocusEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_FocusEvent_idl__
#define __com_sun_star_awt_FocusEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/FontDescriptor.idl b/offapi/com/sun/star/awt/FontDescriptor.idl
index 54107d6466d4..5133acd918f1 100644
--- a/offapi/com/sun/star/awt/FontDescriptor.idl
+++ b/offapi/com/sun/star/awt/FontDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_FontDescriptor_idl__
#define __com_sun_star_awt_FontDescriptor_idl__
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/Gradient.idl b/offapi/com/sun/star/awt/Gradient.idl
index 9774bc655d2a..71ccea76924c 100644
--- a/offapi/com/sun/star/awt/Gradient.idl
+++ b/offapi/com/sun/star/awt/Gradient.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_Gradient_idl__
#define __com_sun_star_awt_Gradient_idl__
-#ifndef __com_sun_star_awt_GradientStyle_idl__
#include <com/sun/star/awt/GradientStyle.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/InputEvent.idl b/offapi/com/sun/star/awt/InputEvent.idl
index 478dc622fcb2..a33efc6e2d96 100644
--- a/offapi/com/sun/star/awt/InputEvent.idl
+++ b/offapi/com/sun/star/awt/InputEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_InputEvent_idl__
#define __com_sun_star_awt_InputEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/ItemEvent.idl b/offapi/com/sun/star/awt/ItemEvent.idl
index 3b5a07765d81..8bfd9dfbe114 100644
--- a/offapi/com/sun/star/awt/ItemEvent.idl
+++ b/offapi/com/sun/star/awt/ItemEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_ItemEvent_idl__
#define __com_sun_star_awt_ItemEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/KeyEvent.idl b/offapi/com/sun/star/awt/KeyEvent.idl
index 6d185b9ba26e..607215c85859 100644
--- a/offapi/com/sun/star/awt/KeyEvent.idl
+++ b/offapi/com/sun/star/awt/KeyEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_KeyEvent_idl__
#define __com_sun_star_awt_KeyEvent_idl__
-#ifndef __com_sun_star_awt_InputEvent_idl__
#include <com/sun/star/awt/InputEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/MaxChildrenException.idl b/offapi/com/sun/star/awt/MaxChildrenException.idl
index a73ddb2f5233..54bedbfb27a1 100644
--- a/offapi/com/sun/star/awt/MaxChildrenException.idl
+++ b/offapi/com/sun/star/awt/MaxChildrenException.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_awt_MaxChildrenException_idl__
#define __com_sun_star_awt_MaxChildrenException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/MenuBar.idl b/offapi/com/sun/star/awt/MenuBar.idl
index 4f95cd74f9bc..8a241cc372c4 100644
--- a/offapi/com/sun/star/awt/MenuBar.idl
+++ b/offapi/com/sun/star/awt/MenuBar.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_MenuBar_idl__
#define __com_sun_star_awt_MenuBar_idl__
-#ifndef __com_sun_star_awt_XMenuBar_idl__
#include <com/sun/star/awt/XMenuBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/MenuEvent.idl b/offapi/com/sun/star/awt/MenuEvent.idl
index 48f326f5f7cc..fd8a17115d1a 100644
--- a/offapi/com/sun/star/awt/MenuEvent.idl
+++ b/offapi/com/sun/star/awt/MenuEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_MenuEvent_idl__
#define __com_sun_star_awt_MenuEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/MenuLogo.idl b/offapi/com/sun/star/awt/MenuLogo.idl
index a84f6be2f04a..d0bbf4223287 100644
--- a/offapi/com/sun/star/awt/MenuLogo.idl
+++ b/offapi/com/sun/star/awt/MenuLogo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_MenuLogo_idl__
#define __com_sun_star_awt_MenuLogo_idl__
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_util_color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/MouseEvent.idl b/offapi/com/sun/star/awt/MouseEvent.idl
index 62c881d91de7..17574db373d4 100644
--- a/offapi/com/sun/star/awt/MouseEvent.idl
+++ b/offapi/com/sun/star/awt/MouseEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_MouseEvent_idl__
#define __com_sun_star_awt_MouseEvent_idl__
-#ifndef __com_sun_star_awt_InputEvent_idl__
#include <com/sun/star/awt/InputEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/PaintEvent.idl b/offapi/com/sun/star/awt/PaintEvent.idl
index f3ba266b3a0a..b3477b076ce1 100644
--- a/offapi/com/sun/star/awt/PaintEvent.idl
+++ b/offapi/com/sun/star/awt/PaintEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_PaintEvent_idl__
#define __com_sun_star_awt_PaintEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/PopupMenu.idl b/offapi/com/sun/star/awt/PopupMenu.idl
index a0ab3830f630..9a4f81cc40e4 100644
--- a/offapi/com/sun/star/awt/PopupMenu.idl
+++ b/offapi/com/sun/star/awt/PopupMenu.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_PopupMenu_idl__
#define __com_sun_star_awt_PopupMenu_idl__
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/XPopupMenu.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/PrinterException.idl b/offapi/com/sun/star/awt/PrinterException.idl
index 805b52e86b98..9493780b41c0 100644
--- a/offapi/com/sun/star/awt/PrinterException.idl
+++ b/offapi/com/sun/star/awt/PrinterException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_PrinterException_idl__
#define __com_sun_star_awt_PrinterException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/SpinEvent.idl b/offapi/com/sun/star/awt/SpinEvent.idl
index bcba2b554aad..de3aa7c7ad29 100644
--- a/offapi/com/sun/star/awt/SpinEvent.idl
+++ b/offapi/com/sun/star/awt/SpinEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_SpinEvent_idl__
#define __com_sun_star_awt_SpinEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/TabController.idl b/offapi/com/sun/star/awt/TabController.idl
index 7b9ded82d233..42578cec7dfc 100644
--- a/offapi/com/sun/star/awt/TabController.idl
+++ b/offapi/com/sun/star/awt/TabController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_TabController_idl__
#define __com_sun_star_awt_TabController_idl__
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/TabControllerModel.idl b/offapi/com/sun/star/awt/TabControllerModel.idl
index c85e6336c6f9..e63d054e2a34 100644
--- a/offapi/com/sun/star/awt/TabControllerModel.idl
+++ b/offapi/com/sun/star/awt/TabControllerModel.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_TabControllerModel_idl__
#define __com_sun_star_awt_TabControllerModel_idl__
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/TextEvent.idl b/offapi/com/sun/star/awt/TextEvent.idl
index 537fa2d1016b..d4624ac2a302 100644
--- a/offapi/com/sun/star/awt/TextEvent.idl
+++ b/offapi/com/sun/star/awt/TextEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_TextEvent_idl__
#define __com_sun_star_awt_TextEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/Toolkit.idl b/offapi/com/sun/star/awt/Toolkit.idl
index a065776a535b..c97a096a4a2b 100644
--- a/offapi/com/sun/star/awt/Toolkit.idl
+++ b/offapi/com/sun/star/awt/Toolkit.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_Toolkit_idl__
#define __com_sun_star_awt_Toolkit_idl__
-#ifndef __com_sun_star_awt_XToolkit_idl__
#include <com/sun/star/awt/XToolkit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
#include <com/sun/star/awt/XDataTransferProviderAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSystemChildFactory_idl__
#include <com/sun/star/awt/XSystemChildFactory.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
#include <com/sun/star/awt/XMessageBoxFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControl.idl b/offapi/com/sun/star/awt/UnoControl.idl
index 38acae5635e3..0abc21ccde01 100644
--- a/offapi/com/sun/star/awt/UnoControl.idl
+++ b/offapi/com/sun/star/awt/UnoControl.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_awt_UnoControl_idl__
#define __com_sun_star_awt_UnoControl_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XView_idl__
#include <com/sun/star/awt/XView.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index 96e2ac272e57..83837a71129a 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_UnoButtonControl_idl__
#define __com_sun_star_awt_UnoButtonControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XButton_idl__
#include <com/sun/star/awt/XButton.idl>
-#endif
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index ae4773fe66bc..2ddec93c4c99 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
#define __com_sun_star_awt_UnoControlButtonModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index f9f286e5b8fb..669550451af5 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__
#define __com_sun_star_awt_UnoCheckBoxControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XCheckBox_idl__
#include <com/sun/star/awt/XCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index e6eb9754175d..b94ed361c7db 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
#define __com_sun_star_awt_UnoControlCheckBoxModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 0392f571cd33..6867c95d9b76 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_UnoComboBoxControl_idl__
#define __com_sun_star_awt_UnoComboBoxControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-#ifndef __com_sun_star_awt_XComboBox_idl__
#include <com/sun/star/awt/XComboBox.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index c89ab34cdec8..c09ed83a2cdc 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
#define __com_sun_star_awt_UnoControlComboBoxModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
#include <com/sun/star/awt/XItemList.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlContainer.idl b/offapi/com/sun/star/awt/UnoControlContainer.idl
index 1b63521680a2..2fd6e38cc841 100644
--- a/offapi/com/sun/star/awt/UnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainer.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_UnoControlContainer_idl__
#define __com_sun_star_awt_UnoControlContainer_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUnoControlContainer_idl__
#include <com/sun/star/awt/XUnoControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlContainer_idl__
#include <com/sun/star/awt/XControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlContainerModel.idl b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
index 1fa71bcf1b7c..05f3487e32b1 100644
--- a/offapi/com/sun/star/awt/UnoControlContainerModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlContainerModel_idl__
#define __com_sun_star_awt_UnoControlContainerModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index 06159fb54ed2..eb2d7a771960 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__
#define __com_sun_star_awt_UnoCurrencyFieldControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XCurrencyField_idl__
#include <com/sun/star/awt/XCurrencyField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index 9ea37aabc43d..76b3f5e82c09 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
#define __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index 77f7f677a28e..34eb19dc9f0b 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoDateFieldControl_idl__
#define __com_sun_star_awt_UnoDateFieldControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDateField_idl__
#include <com/sun/star/awt/XDateField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index a44559b1bbf2..07f576cc35e6 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
#define __com_sun_star_awt_UnoControlDateFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDialog.idl b/offapi/com/sun/star/awt/UnoControlDialog.idl
index f2f1be2dc49c..e159ba29c95b 100644
--- a/offapi/com/sun/star/awt/UnoControlDialog.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialog.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlDialog_idl__
#define __com_sun_star_awt_UnoControlDialog_idl__
-#ifndef __com_sun_star_awt_UnoControlContainer_idl__
#include <com/sun/star/awt/UnoControlContainer.idl>
-#endif
-#ifndef __com_sun_star_awt_XTopWindow_idl__
#include <com/sun/star/awt/XTopWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog2_idl__
#include <com/sun/star/awt/XDialog2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
index f8970413cdd3..46eb7d6f0c81 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
@@ -27,33 +27,14 @@
#ifndef __com_sun_star_awt_UnoControlDialogModel_idl__
#define __com_sun_star_awt_UnoControlDialogModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlEdit.idl b/offapi/com/sun/star/awt/UnoControlEdit.idl
index e603aa3ee29b..a688107ebe36 100644
--- a/offapi/com/sun/star/awt/UnoControlEdit.idl
+++ b/offapi/com/sun/star/awt/UnoControlEdit.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#define __com_sun_star_awt_UnoControlEdit_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XTextComponent_idl__
#include <com/sun/star/awt/XTextComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
#include <com/sun/star/awt/XTextLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index 094ef6e58f92..c6df7615e902 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#define __com_sun_star_awt_UnoControlEditModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index da2eceb5fef5..ffa3d2a50f00 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_UnoFileControl_idl__
#define __com_sun_star_awt_UnoFileControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
index cec080c3fcb2..7a82e4e05024 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
#define __com_sun_star_awt_UnoControlFileControlModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index fa0e96885304..de1051bc96f3 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
#define __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFixedHyperlink_idl__
#include <com/sun/star/awt/XFixedHyperlink.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
index e4a6bd3dbd58..e7e200211e3f 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
#define __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index 6dd1b1e36e0e..858278ea3c3b 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_UnoFixedLineControl_idl__
#define __com_sun_star_awt_UnoFixedLineControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
index b49b6e94d19a..f6a8ba301906 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlFixedLineModel_idl__
#define __com_sun_star_awt_UnoControlFixedLineModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index e4dd759f19d2..40cd90b47e33 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_UnoFixedTextControl_idl__
#define __com_sun_star_awt_UnoFixedTextControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XFixedText_idl__
#include <com/sun/star/awt/XFixedText.idl>
-#endif
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index 8ca74f131152..63223af6ce45 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
#define __com_sun_star_awt_UnoControlFixedTextModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedField.idl b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
index 9d66a3e319a1..b40c5e1c223c 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedField.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
#define __com_sun_star_awt_UnoControlFormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index d30a03346b18..420daa6fb26a 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
#define __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index cc1aaff14985..ff7026f8f227 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__
#define __com_sun_star_awt_UnoGroupBoxControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
index c0a5d97afc06..f61e770dd57f 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
#define __com_sun_star_awt_UnoControlGroupBoxModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index 8b7d3bc9d12b..fbe2f0257ce2 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoImageControl_idl__
#define __com_sun_star_awt_UnoImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 7e6dfa8641be..edb98608be2b 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#define __com_sun_star_awt_UnoControlImageControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index edc34550242e..3c6086a898ed 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoListBoxControl_idl__
#define __com_sun_star_awt_UnoListBoxControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XListBox_idl__
#include <com/sun/star/awt/XListBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
#include <com/sun/star/awt/XTextLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 4456d49ea0be..d542eeaea8ab 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
#define __com_sun_star_awt_UnoControlListBoxModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
#include <com/sun/star/awt/XItemList.idl>
-
//=============================================================================
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/UnoControlModel.idl b/offapi/com/sun/star/awt/UnoControlModel.idl
index 22fba6dce0b2..949191528886 100644
--- a/offapi/com/sun/star/awt/UnoControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlModel.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_awt_UnoControlModel_idl__
#define __com_sun_star_awt_UnoControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlDialogElement_idl__
#include <com/sun/star/awt/UnoControlDialogElement.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlNumericField.idl b/offapi/com/sun/star/awt/UnoControlNumericField.idl
index f09d7739bb98..05c23692f954 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericField.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
#define __com_sun_star_awt_UnoControlNumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XNumericField_idl__
#include <com/sun/star/awt/XNumericField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index 1d080175a780..b8ee00156495 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
#define __com_sun_star_awt_UnoControlNumericFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index 415265eeb690..a2d41622d320 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__
#define __com_sun_star_awt_UnoPatternFieldControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPatternField_idl__
#include <com/sun/star/awt/XPatternField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index 2f9f09fd5b3f..11a9bbbfe85e 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
#define __com_sun_star_awt_UnoControlPatternFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index 72240452a324..bed87fd0d861 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_UnoProgressBarControl_idl__
#define __com_sun_star_awt_UnoProgressBarControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XProgressBar_idl__
#include <com/sun/star/awt/XProgressBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
index 3d54d391e3db..a1c3b32a25df 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlProgressBarModel_idl__
#define __com_sun_star_awt_UnoControlProgressBarModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index 72c88df107bd..ff05ab488136 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_UnoButtonControl_idl__
#define __com_sun_star_awt_UnoButtonControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XRadioButton_idl__
#include <com/sun/star/awt/XRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index cd8568f956ea..198f4006999a 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
#define __com_sun_star_awt_UnoControlRadioButtonModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmap.idl b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
index f698deea53e4..3fe0fcedfcbe 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmap.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlRoadmap_idl__
#define __com_sun_star_awt_UnoControlRoadmap_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
#include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 6d2f21960105..772c6ea1006b 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -28,18 +28,10 @@
#define __com_sun_star_awt_UnoControlRoadmapModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index 403df8459d46..c4b0003a23a2 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoScrollBarControl_idl__
#define __com_sun_star_awt_UnoScrollBarControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XScrollBar_idl__
#include <com/sun/star/awt/XScrollBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
index 62a8977b2e88..def0b0c61b9f 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
#define __com_sun_star_awt_UnoControlScrollBarModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index b00ec8740521..7a74aa9746e3 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoControlSimpleAnimation_idl__
#define __com_sun_star_awt_UnoControlSimpleAnimation_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
#include <com/sun/star/awt/XSimpleAnimation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index 1f96099fee63..3454eb9cf6ed 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
#define __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index db8386c4304f..ee2b82db755a 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoSpinButtonControl_idl__
#define __com_sun_star_awt_UnoSpinButtonControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinValue_idl__
#include <com/sun/star/awt/XSpinValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index ee8a23b15f9b..b5bb0791fed6 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
#define __com_sun_star_awt_UnoControlSpinButtonModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index 85b5d8b850f7..2eb8f780780f 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_UnoControlThrobber_idl__
#define __com_sun_star_awt_UnoControlThrobber_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XThrobber_idl__
#include <com/sun/star/awt/XThrobber.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index 060ff105c119..e65a825963d4 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__
#define __com_sun_star_awt_UnoControlThrobberModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index 310f0b9b9539..7389b6385e1d 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__
#define __com_sun_star_awt_UnoTimeFieldControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTimeField_idl__
#include <com/sun/star/awt/XTimeField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index 893cfe73a45e..d10e34a2534a 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
#define __com_sun_star_awt_UnoControlTimeFieldModel_idl__
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/VclContainerEvent.idl b/offapi/com/sun/star/awt/VclContainerEvent.idl
index 2f4595e984e9..27c99cc71f7f 100644
--- a/offapi/com/sun/star/awt/VclContainerEvent.idl
+++ b/offapi/com/sun/star/awt/VclContainerEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_VclContainerEvent_idl__
#define __com_sun_star_awt_VclContainerEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl
index d5e430668d85..b62e4f6f8fbe 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_WindowDescriptor_idl__
#define __com_sun_star_awt_WindowDescriptor_idl__
-#ifndef __com_sun_star_awt_WindowClass_idl__
#include <com/sun/star/awt/WindowClass.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/WindowEvent.idl b/offapi/com/sun/star/awt/WindowEvent.idl
index fb46c18b19f6..a99dad684ec1 100644
--- a/offapi/com/sun/star/awt/WindowEvent.idl
+++ b/offapi/com/sun/star/awt/WindowEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_WindowEvent_idl__
#define __com_sun_star_awt_WindowEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XActionListener.idl b/offapi/com/sun/star/awt/XActionListener.idl
index 15dbc6110320..32671a9eb4ed 100644
--- a/offapi/com/sun/star/awt/XActionListener.idl
+++ b/offapi/com/sun/star/awt/XActionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XActionListener_idl__
#define __com_sun_star_awt_XActionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_ActionEvent_idl__
#include <com/sun/star/awt/ActionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XActivateListener.idl b/offapi/com/sun/star/awt/XActivateListener.idl
index 954b5e11294c..b0d9d88d4592 100644
--- a/offapi/com/sun/star/awt/XActivateListener.idl
+++ b/offapi/com/sun/star/awt/XActivateListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XActivateListener_idl__
#define __com_sun_star_awt_XActivateListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XAdjustmentListener.idl b/offapi/com/sun/star/awt/XAdjustmentListener.idl
index 4e56f96170cf..e0408fc8e059 100644
--- a/offapi/com/sun/star/awt/XAdjustmentListener.idl
+++ b/offapi/com/sun/star/awt/XAdjustmentListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
#define __com_sun_star_awt_XAdjustmentListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_AdjustmentEvent_idl__
#include <com/sun/star/awt/AdjustmentEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XBitmap.idl b/offapi/com/sun/star/awt/XBitmap.idl
index 4c1a650d796a..9825f87977c9 100644
--- a/offapi/com/sun/star/awt/XBitmap.idl
+++ b/offapi/com/sun/star/awt/XBitmap.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XBitmap_idl__
#define __com_sun_star_awt_XBitmap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl
index 47b24d757811..2c22dd9824b3 100644
--- a/offapi/com/sun/star/awt/XButton.idl
+++ b/offapi/com/sun/star/awt/XButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XButton_idl__
#define __com_sun_star_awt_XButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XCallback.idl b/offapi/com/sun/star/awt/XCallback.idl
index 25cc9bd522bb..610b0d462678 100644
--- a/offapi/com/sun/star/awt/XCallback.idl
+++ b/offapi/com/sun/star/awt/XCallback.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XCallback_idl__
#define __com_sun_star_awt_XCallback_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XCheckBox.idl b/offapi/com/sun/star/awt/XCheckBox.idl
index 0e1011d75294..284adbe3c6b8 100644
--- a/offapi/com/sun/star/awt/XCheckBox.idl
+++ b/offapi/com/sun/star/awt/XCheckBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XCheckBox_idl__
#define __com_sun_star_awt_XCheckBox_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XItemListener_idl__
#include <com/sun/star/awt/XItemListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XComboBox.idl b/offapi/com/sun/star/awt/XComboBox.idl
index b85b36a037d3..88e22fa8a5f2 100644
--- a/offapi/com/sun/star/awt/XComboBox.idl
+++ b/offapi/com/sun/star/awt/XComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XComboBox_idl__
#define __com_sun_star_awt_XComboBox_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XItemListener_idl__
#include <com/sun/star/awt/XItemListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
index d1e2d725c02e..10a7eb9e6c14 100644
--- a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_awt_XContainerWindowEventHandler_idl__
#define __com_sun_star_awt_XContainerWindowEventHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XContainerWindowProvider.idl b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
index 1cea42d99a80..cef1329dcea0 100644
--- a/offapi/com/sun/star/awt/XContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
#define __com_sun_star_awt_XContainerWindowProvider_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XControl.idl b/offapi/com/sun/star/awt/XControl.idl
index ebc58f9967f3..870d4f16eb8f 100644
--- a/offapi/com/sun/star/awt/XControl.idl
+++ b/offapi/com/sun/star/awt/XControl.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_awt_XControl_idl__
#define __com_sun_star_awt_XControl_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XToolkit_idl__
#include <com/sun/star/awt/XToolkit.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_XView_idl__
#include <com/sun/star/awt/XView.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XControlContainer.idl b/offapi/com/sun/star/awt/XControlContainer.idl
index 938d4ca364a0..dd165feb8e5e 100644
--- a/offapi/com/sun/star/awt/XControlContainer.idl
+++ b/offapi/com/sun/star/awt/XControlContainer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XControlContainer_idl__
#define __com_sun_star_awt_XControlContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XControlModel.idl b/offapi/com/sun/star/awt/XControlModel.idl
index a8e7c84b93d1..b906ae50a162 100644
--- a/offapi/com/sun/star/awt/XControlModel.idl
+++ b/offapi/com/sun/star/awt/XControlModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XControlModel_idl__
#define __com_sun_star_awt_XControlModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XCurrencyField.idl b/offapi/com/sun/star/awt/XCurrencyField.idl
index d1345bfc679b..73fabb4fba66 100644
--- a/offapi/com/sun/star/awt/XCurrencyField.idl
+++ b/offapi/com/sun/star/awt/XCurrencyField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XCurrencyField_idl__
#define __com_sun_star_awt_XCurrencyField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
index 8ce12873836a..13401c554dff 100644
--- a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
+++ b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
#define __com_sun_star_awt_XDataTransferProviderAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDateField.idl b/offapi/com/sun/star/awt/XDateField.idl
index f7c0e3cc8f19..00bb6dbaf931 100644
--- a/offapi/com/sun/star/awt/XDateField.idl
+++ b/offapi/com/sun/star/awt/XDateField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XDateField_idl__
#define __com_sun_star_awt_XDateField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDevice.idl b/offapi/com/sun/star/awt/XDevice.idl
index 9d05c05e5e2e..e7932ad1e17d 100644
--- a/offapi/com/sun/star/awt/XDevice.idl
+++ b/offapi/com/sun/star/awt/XDevice.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XDevice_idl__
#define __com_sun_star_awt_XDevice_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_DeviceInfo_idl__
#include <com/sun/star/awt/DeviceInfo.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialog.idl b/offapi/com/sun/star/awt/XDialog.idl
index 831c80597070..a107f0be1a18 100644
--- a/offapi/com/sun/star/awt/XDialog.idl
+++ b/offapi/com/sun/star/awt/XDialog.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XDialog_idl__
#define __com_sun_star_awt_XDialog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
index e937dea9bb24..98d737f08655 100644
--- a/offapi/com/sun/star/awt/XDialog2.idl
+++ b/offapi/com/sun/star/awt/XDialog2.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_awt_XDialog2_idl__
#define __com_sun_star_awt_XDialog2_idl__
-#ifndef __com_sun_star_awt_XDialog_idl__
#include <com/sun/star/awt/XDialog.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogEventHandler.idl b/offapi/com/sun/star/awt/XDialogEventHandler.idl
index 206d71bb5dee..b361479fdb67 100644
--- a/offapi/com/sun/star/awt/XDialogEventHandler.idl
+++ b/offapi/com/sun/star/awt/XDialogEventHandler.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_awt_XDialogEventHandler_idl__
#define __com_sun_star_awt_XDialogEventHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__
#include <com/sun/star/awt/XDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogProvider.idl b/offapi/com/sun/star/awt/XDialogProvider.idl
index 2ab873df16b6..18695aa3633a 100644
--- a/offapi/com/sun/star/awt/XDialogProvider.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_awt_XDialogProvider_idl__
#define __com_sun_star_awt_XDialogProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__
#include <com/sun/star/awt/XDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index f24a783cb7fc..a2b1d496f8a4 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_awt_XDialogProvider2_idl__
#define __com_sun_star_awt_XDialogProvider2_idl__
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
#include <com/sun/star/awt/XDialogProvider.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDisplayBitmap.idl b/offapi/com/sun/star/awt/XDisplayBitmap.idl
index b7b8d0fc3757..008a2fb16e8a 100644
--- a/offapi/com/sun/star/awt/XDisplayBitmap.idl
+++ b/offapi/com/sun/star/awt/XDisplayBitmap.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XDisplayBitmap_idl__
#define __com_sun_star_awt_XDisplayBitmap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDisplayConnection.idl b/offapi/com/sun/star/awt/XDisplayConnection.idl
index d8eb109933fc..7645fc2083fc 100644
--- a/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XDisplayConnection_idl__
#define __com_sun_star_awt_XDisplayConnection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDockableWindow.idl b/offapi/com/sun/star/awt/XDockableWindow.idl
index 61d77fa2d81a..d7d4960f57ac 100644
--- a/offapi/com/sun/star/awt/XDockableWindow.idl
+++ b/offapi/com/sun/star/awt/XDockableWindow.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_XDockableWindow_idl__
#define __com_sun_star_awt_XDockableWindow_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDockableWindowListener_idl__
#include <com/sun/star/awt/XDockableWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDockableWindowListener.idl b/offapi/com/sun/star/awt/XDockableWindowListener.idl
index 695abc448564..40411aa40348 100644
--- a/offapi/com/sun/star/awt/XDockableWindowListener.idl
+++ b/offapi/com/sun/star/awt/XDockableWindowListener.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_awt_XDockableWindowListener_idl__
#define __com_sun_star_awt_XDockableWindowListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingData_idl__
#include <com/sun/star/awt/DockingData.idl>
-#endif
-#ifndef __com_sun_star_awt_EndDockingEvent_idl__
#include <com/sun/star/awt/EndDockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingEvent_idl__
#include <com/sun/star/awt/DockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
#include <com/sun/star/awt/EndPopupModeEvent.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
index 64dde0ed9390..fc512c8e5746 100644
--- a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
#define __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
#include <com/sun/star/awt/EnhancedMouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XEventHandler.idl b/offapi/com/sun/star/awt/XEventHandler.idl
index e3ea40a626c2..0dd2040f1990 100644
--- a/offapi/com/sun/star/awt/XEventHandler.idl
+++ b/offapi/com/sun/star/awt/XEventHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XEventHandler_idl__
#define __com_sun_star_awt_XEventHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index 95541217281d..d37f4639780f 100644
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -28,29 +28,12 @@
#ifndef __com_sun_star_awt_XExtendedToolkit_idl__
#define __com_sun_star_awt_XExtendedToolkit_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindow_idl__
#include <com/sun/star/awt/XTopWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
#include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
#include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFocusListener_idl__
#include <com/sun/star/awt/XFocusListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFileDialog.idl b/offapi/com/sun/star/awt/XFileDialog.idl
index b9fe07c9e472..758d5decd3b1 100644
--- a/offapi/com/sun/star/awt/XFileDialog.idl
+++ b/offapi/com/sun/star/awt/XFileDialog.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XFileDialog_idl__
#define __com_sun_star_awt_XFileDialog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFixedHyperlink.idl b/offapi/com/sun/star/awt/XFixedHyperlink.idl
index 9fb6965b6e4a..7b86e665ecfc 100644
--- a/offapi/com/sun/star/awt/XFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/XFixedHyperlink.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XFixedHyperlink_idl__
#define __com_sun_star_awt_XFixedHyperlink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFixedText.idl b/offapi/com/sun/star/awt/XFixedText.idl
index 55b3202e7173..6e234e8364ff 100644
--- a/offapi/com/sun/star/awt/XFixedText.idl
+++ b/offapi/com/sun/star/awt/XFixedText.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XFixedText_idl__
#define __com_sun_star_awt_XFixedText_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFocusListener.idl b/offapi/com/sun/star/awt/XFocusListener.idl
index fc45be62aa07..a6c001140a78 100644
--- a/offapi/com/sun/star/awt/XFocusListener.idl
+++ b/offapi/com/sun/star/awt/XFocusListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XFocusListener_idl__
#define __com_sun_star_awt_XFocusListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_FocusEvent_idl__
#include <com/sun/star/awt/FocusEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFont.idl b/offapi/com/sun/star/awt/XFont.idl
index 816db2f8f24f..0318a8407748 100644
--- a/offapi/com/sun/star/awt/XFont.idl
+++ b/offapi/com/sun/star/awt/XFont.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XFont_idl__
#define __com_sun_star_awt_XFont_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
#include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XFont2.idl b/offapi/com/sun/star/awt/XFont2.idl
index b67e8f2c1dee..702c835d76a5 100644
--- a/offapi/com/sun/star/awt/XFont2.idl
+++ b/offapi/com/sun/star/awt/XFont2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XFont2_idl__
#define __com_sun_star_awt_XFont2_idl__
-#ifndef __com_sun_star_awt_XFont_idl__
#include <com/sun/star/awt/XFont.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XGraphics.idl b/offapi/com/sun/star/awt/XGraphics.idl
index 2b6b63a26b2e..be26a055bcf7 100644
--- a/offapi/com/sun/star/awt/XGraphics.idl
+++ b/offapi/com/sun/star/awt/XGraphics.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_awt_XGraphics_idl__
#define __com_sun_star_awt_XGraphics_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
#include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_RasterOperation_idl__
#include <com/sun/star/awt/RasterOperation.idl>
-#endif
-#ifndef __com_sun_star_awt_Gradient_idl__
#include <com/sun/star/awt/Gradient.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XImageButton.idl b/offapi/com/sun/star/awt/XImageButton.idl
index e3676b50711d..605ab48ab523 100644
--- a/offapi/com/sun/star/awt/XImageButton.idl
+++ b/offapi/com/sun/star/awt/XImageButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XImageButton_idl__
#define __com_sun_star_awt_XImageButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XImageConsumer.idl b/offapi/com/sun/star/awt/XImageConsumer.idl
index 60c1223be42a..066b12d67c1c 100644
--- a/offapi/com/sun/star/awt/XImageConsumer.idl
+++ b/offapi/com/sun/star/awt/XImageConsumer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XImageConsumer_idl__
#define __com_sun_star_awt_XImageConsumer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XImageProducer.idl b/offapi/com/sun/star/awt/XImageProducer.idl
index 0dc15218012c..6adcda8bb4e4 100644
--- a/offapi/com/sun/star/awt/XImageProducer.idl
+++ b/offapi/com/sun/star/awt/XImageProducer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XImageProducer_idl__
#define __com_sun_star_awt_XImageProducer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XImageConsumer_idl__
#include <com/sun/star/awt/XImageConsumer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XInfoPrinter.idl b/offapi/com/sun/star/awt/XInfoPrinter.idl
index 71afa45e0bc1..f1aefb5764aa 100644
--- a/offapi/com/sun/star/awt/XInfoPrinter.idl
+++ b/offapi/com/sun/star/awt/XInfoPrinter.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XInfoPrinter_idl__
#define __com_sun_star_awt_XInfoPrinter_idl__
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
#include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
index ca4bb0727f91..54aa6984a2b5 100644
--- a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
+++ b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
#define __com_sun_star_awt_XItemEventBroadcaster_idl__
-#ifndef __com_sun_star_awt_XItemListener_idl__
#include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
diff --git a/offapi/com/sun/star/awt/XItemListener.idl b/offapi/com/sun/star/awt/XItemListener.idl
index ccb7b90ab773..1a282e2874a6 100644
--- a/offapi/com/sun/star/awt/XItemListener.idl
+++ b/offapi/com/sun/star/awt/XItemListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XItemListener_idl__
#define __com_sun_star_awt_XItemListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_ItemEvent_idl__
#include <com/sun/star/awt/ItemEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index 7a79ac3b0a08..ee5098aee81e 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -28,13 +28,9 @@
#ifndef __com_sun_star_awt_XKeyHandler_idl__
#define __com_sun_star_awt_XKeyHandler_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/XKeyListener.idl b/offapi/com/sun/star/awt/XKeyListener.idl
index 299cfddb9ad3..c3f71f0cdb94 100644
--- a/offapi/com/sun/star/awt/XKeyListener.idl
+++ b/offapi/com/sun/star/awt/XKeyListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XKeyListener_idl__
#define __com_sun_star_awt_XKeyListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutConstrains.idl b/offapi/com/sun/star/awt/XLayoutConstrains.idl
index c715d1b7d5d8..a071be89c336 100644
--- a/offapi/com/sun/star/awt/XLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XLayoutConstrains.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#define __com_sun_star_awt_XLayoutConstrains_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl
index c85d35d223c1..76d16055d721 100644
--- a/offapi/com/sun/star/awt/XLayoutContainer.idl
+++ b/offapi/com/sun/star/awt/XLayoutContainer.idl
@@ -1,24 +1,12 @@
#ifndef __com_sun_star_awt_XLayoutContainer_idl__
#define __com_sun_star_awt_XLayoutContainer_idl__
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__
#include <com/sun/star/awt/MaxChildrenException.idl>
-#endif
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
#include <com/sun/star/awt/XLayoutUnit.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl
index 3234f15e13cf..064a2b41218c 100644
--- a/offapi/com/sun/star/awt/XLayoutRoot.idl
+++ b/offapi/com/sun/star/awt/XLayoutRoot.idl
@@ -1,15 +1,9 @@
#ifndef __com_sun_star_awt_XLayoutRoot_idl__
#define __com_sun_star_awt_XLayoutRoot_idl__
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
#include <com/sun/star/awt/XLayoutContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl
index cc3581ae4aa3..a3bcd8ea4261 100644
--- a/offapi/com/sun/star/awt/XLayoutUnit.idl
+++ b/offapi/com/sun/star/awt/XLayoutUnit.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_awt_XLayoutUnit_idl__
#define __com_sun_star_awt_XLayoutUnit_idl__
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
#include <com/sun/star/awt/XLayoutContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XListBox.idl b/offapi/com/sun/star/awt/XListBox.idl
index 32b458d62a2f..adacd5d6c33e 100644
--- a/offapi/com/sun/star/awt/XListBox.idl
+++ b/offapi/com/sun/star/awt/XListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XListBox_idl__
#define __com_sun_star_awt_XListBox_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XItemListener_idl__
#include <com/sun/star/awt/XItemListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenu.idl b/offapi/com/sun/star/awt/XMenu.idl
index 7d7426ca1e1d..7b990a211b6d 100644
--- a/offapi/com/sun/star/awt/XMenu.idl
+++ b/offapi/com/sun/star/awt/XMenu.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XMenu_idl__
#define __com_sun_star_awt_XMenu_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuBar.idl b/offapi/com/sun/star/awt/XMenuBar.idl
index 40d92b9f0b80..86fabe34e47d 100644
--- a/offapi/com/sun/star/awt/XMenuBar.idl
+++ b/offapi/com/sun/star/awt/XMenuBar.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XMenuBar_idl__
#define __com_sun_star_awt_XMenuBar_idl__
-#ifndef __com_sun_star_awt_XMenu_idl__
#include <com/sun/star/awt/XMenu.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuBarExtended.idl b/offapi/com/sun/star/awt/XMenuBarExtended.idl
index 97fbbb39f7a9..75880ab13592 100644
--- a/offapi/com/sun/star/awt/XMenuBarExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuBarExtended.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_XMenuBarExtended_idl__
#define __com_sun_star_awt_XMenuBarExtended_idl__
-#ifndef __com_sun_star_awt_XMenuBar_idl__
#include <com/sun/star/awt/XMenuBar.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
#include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuExtended.idl b/offapi/com/sun/star/awt/XMenuExtended.idl
index ba850ca5d416..a2251bb1d061 100644
--- a/offapi/com/sun/star/awt/XMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XMenuExtended_idl__
#define __com_sun_star_awt_XMenuExtended_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuExtended2.idl b/offapi/com/sun/star/awt/XMenuExtended2.idl
index d1b97254194e..b87ebef4e537 100644
--- a/offapi/com/sun/star/awt/XMenuExtended2.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended2.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_XMenuExtended2_idl__
#define __com_sun_star_awt_XMenuExtended2_idl__
-#ifndef __com_sun_star_awt_XMenu_idl__
#include <com/sun/star/awt/XMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended_idl__
#include <com/sun/star/awt/XMenuExtended.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuItemType_idl__
#include <com/sun/star/awt/MenuItemType.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuListener.idl b/offapi/com/sun/star/awt/XMenuListener.idl
index 12f713f83fb4..9f4c35497590 100644
--- a/offapi/com/sun/star/awt/XMenuListener.idl
+++ b/offapi/com/sun/star/awt/XMenuListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XMenuListener_idl__
#define __com_sun_star_awt_XMenuListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_MenuEvent_idl__
#include <com/sun/star/awt/MenuEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMessageBox.idl b/offapi/com/sun/star/awt/XMessageBox.idl
index e10984a42f01..d34b46e7ea8a 100644
--- a/offapi/com/sun/star/awt/XMessageBox.idl
+++ b/offapi/com/sun/star/awt/XMessageBox.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XMessageBox_idl__
#define __com_sun_star_awt_XMessageBox_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMessageBoxFactory.idl b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
index 35139b04bee1..e1fc47aeaa1c 100644
--- a/offapi/com/sun/star/awt/XMessageBoxFactory.idl
+++ b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
#define __com_sun_star_awt_XMessageBoxFactory_idl__
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBox_idl__
#include <com/sun/star/awt/XMessageBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__
#include <com/sun/star/awt/MessageBoxButtons.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMetricField.idl b/offapi/com/sun/star/awt/XMetricField.idl
index 5bc6a7da40e2..15ea1d640e2f 100644
--- a/offapi/com/sun/star/awt/XMetricField.idl
+++ b/offapi/com/sun/star/awt/XMetricField.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_awt_XMetricField_idl__
#define __com_sun_star_awt_XMetricField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_MeasureUnit_idl__
#include <com/sun/star/util/MeasureUnit.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseClickHandler.idl b/offapi/com/sun/star/awt/XMouseClickHandler.idl
index ad98f9012cba..8d2414f81b04 100644
--- a/offapi/com/sun/star/awt/XMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseClickHandler.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
#define __com_sun_star_awt_XMouseClickHandler_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseListener.idl b/offapi/com/sun/star/awt/XMouseListener.idl
index e566981c8f0f..71282b4d4112 100644
--- a/offapi/com/sun/star/awt/XMouseListener.idl
+++ b/offapi/com/sun/star/awt/XMouseListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XMouseListener_idl__
#define __com_sun_star_awt_XMouseListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseMotionHandler.idl b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
index 541419711036..00ab02d7c22b 100644
--- a/offapi/com/sun/star/awt/XMouseMotionHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
#define __com_sun_star_awt_XMouseMotionHandler_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 66f2bf8bd9db..06005a8909c8 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
#define __com_sun_star_awt_XMouseMotionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XNumericField.idl b/offapi/com/sun/star/awt/XNumericField.idl
index f07131c453b1..deed913fc65c 100644
--- a/offapi/com/sun/star/awt/XNumericField.idl
+++ b/offapi/com/sun/star/awt/XNumericField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XNumericField_idl__
#define __com_sun_star_awt_XNumericField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPaintListener.idl b/offapi/com/sun/star/awt/XPaintListener.idl
index 95874a5d6e10..46ae86be0590 100644
--- a/offapi/com/sun/star/awt/XPaintListener.idl
+++ b/offapi/com/sun/star/awt/XPaintListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XPaintListener_idl__
#define __com_sun_star_awt_XPaintListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_PaintEvent_idl__
#include <com/sun/star/awt/PaintEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPatternField.idl b/offapi/com/sun/star/awt/XPatternField.idl
index 2db8433f8e57..91bae318a8cc 100644
--- a/offapi/com/sun/star/awt/XPatternField.idl
+++ b/offapi/com/sun/star/awt/XPatternField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XPatternField_idl__
#define __com_sun_star_awt_XPatternField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPointer.idl b/offapi/com/sun/star/awt/XPointer.idl
index 63e5f99944d9..90cb5cbcf122 100644
--- a/offapi/com/sun/star/awt/XPointer.idl
+++ b/offapi/com/sun/star/awt/XPointer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XPointer_idl__
#define __com_sun_star_awt_XPointer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index 8ac7dc729b78..d7c844ae89d4 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XPopupMenu_idl__
#define __com_sun_star_awt_XPopupMenu_idl__
-#ifndef __com_sun_star_awt_XMenu_idl__
#include <com/sun/star/awt/XMenu.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPopupMenuExtended.idl b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
index 69c8753290e7..353446a23c7b 100644
--- a/offapi/com/sun/star/awt/XPopupMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_awt_XPopupMenuExtended_idl__
#define __com_sun_star_awt_XPopupMenuExtended_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/XPopupMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
#include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuLogo_idl__
#include <com/sun/star/awt/MenuLogo.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPrinter.idl b/offapi/com/sun/star/awt/XPrinter.idl
index 4b600ad4ab01..08652be4c338 100644
--- a/offapi/com/sun/star/awt/XPrinter.idl
+++ b/offapi/com/sun/star/awt/XPrinter.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_awt_XPrinter_idl__
#define __com_sun_star_awt_XPrinter_idl__
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
#include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
-#ifndef __com_sun_star_awt_PrinterException_idl__
#include <com/sun/star/awt/PrinterException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPrinterPropertySet.idl b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
index 9dde4b077fe6..b22e49a03a86 100644
--- a/offapi/com/sun/star/awt/XPrinterPropertySet.idl
+++ b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
#define __com_sun_star_awt_XPrinterPropertySet_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XPrinterServer.idl b/offapi/com/sun/star/awt/XPrinterServer.idl
index 275590e3e665..ca97a26e070f 100644
--- a/offapi/com/sun/star/awt/XPrinterServer.idl
+++ b/offapi/com/sun/star/awt/XPrinterServer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XPrinterServer_idl__
#define __com_sun_star_awt_XPrinterServer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XPrinter_idl__
#include <com/sun/star/awt/XPrinter.idl>
-#endif
-#ifndef __com_sun_star_awt_XInfoPrinter_idl__
#include <com/sun/star/awt/XInfoPrinter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XProgressBar.idl b/offapi/com/sun/star/awt/XProgressBar.idl
index 6107c1211105..1ea6c5b483bb 100644
--- a/offapi/com/sun/star/awt/XProgressBar.idl
+++ b/offapi/com/sun/star/awt/XProgressBar.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XProgressBar_idl__
#define __com_sun_star_awt_XProgressBar_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XProgressMonitor.idl b/offapi/com/sun/star/awt/XProgressMonitor.idl
index 74cda157a017..f20dd2cd1e11 100644
--- a/offapi/com/sun/star/awt/XProgressMonitor.idl
+++ b/offapi/com/sun/star/awt/XProgressMonitor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XProgressMonitor_idl__
#define __com_sun_star_awt_XProgressMonitor_idl__
-#ifndef __com_sun_star_awt_XProgressBar_idl__
#include <com/sun/star/awt/XProgressBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XRadioButton.idl b/offapi/com/sun/star/awt/XRadioButton.idl
index 18a05a9cb5fe..b8eb312e741e 100644
--- a/offapi/com/sun/star/awt/XRadioButton.idl
+++ b/offapi/com/sun/star/awt/XRadioButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XRadioButton_idl__
#define __com_sun_star_awt_XRadioButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XItemListener_idl__
#include <com/sun/star/awt/XItemListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XRegion.idl b/offapi/com/sun/star/awt/XRegion.idl
index eabc39ac6697..60fe76cad720 100644
--- a/offapi/com/sun/star/awt/XRegion.idl
+++ b/offapi/com/sun/star/awt/XRegion.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XRegion_idl__
#define __com_sun_star_awt_XRegion_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XRequestCallback.idl b/offapi/com/sun/star/awt/XRequestCallback.idl
index 8c047312ccb7..59363bf75194 100644
--- a/offapi/com/sun/star/awt/XRequestCallback.idl
+++ b/offapi/com/sun/star/awt/XRequestCallback.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XRequestCallback_idl__
#define __com_sun_star_awt_XRequestCallback_idl__
-#ifndef __com_sun_star_awt_XCallback_idl__
#include <com/sun/star/awt/XCallback.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XReschedule.idl b/offapi/com/sun/star/awt/XReschedule.idl
index 7aaff1830b41..59b4a225f277 100644
--- a/offapi/com/sun/star/awt/XReschedule.idl
+++ b/offapi/com/sun/star/awt/XReschedule.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XReschedule_idl__
#define __com_sun_star_awt_XReschedulet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XScrollBar.idl b/offapi/com/sun/star/awt/XScrollBar.idl
index 4a6c3e57e99c..e1799de83ee2 100644
--- a/offapi/com/sun/star/awt/XScrollBar.idl
+++ b/offapi/com/sun/star/awt/XScrollBar.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XScrollBar_idl__
#define __com_sun_star_awt_XScrollBar_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
#include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index bff9eeeb5a90..7ba74e337d73 100644
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
#define __com_sun_star_awt_XSimpleAnimation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl
index 10309ad70a80..06d8b12f2675 100644
--- a/offapi/com/sun/star/awt/XSimpleTabController.idl
+++ b/offapi/com/sun/star/awt/XSimpleTabController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_XSimpleTabController_idl__
#define __com_sun_star_awt_XSimpleTabController_idl__
-#ifndef __com_sun_star_awt_XTabListener_idl__
#include <com/sun/star/awt/XTabListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSpinField.idl b/offapi/com/sun/star/awt/XSpinField.idl
index 580472c8372f..8c830691e7ac 100644
--- a/offapi/com/sun/star/awt/XSpinField.idl
+++ b/offapi/com/sun/star/awt/XSpinField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XSpinField_idl__
#define __com_sun_star_awt_XSpinField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XSpinListener_idl__
#include <com/sun/star/awt/XSpinListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSpinListener.idl b/offapi/com/sun/star/awt/XSpinListener.idl
index 05446c42d29e..5a6b5ee0e887 100644
--- a/offapi/com/sun/star/awt/XSpinListener.idl
+++ b/offapi/com/sun/star/awt/XSpinListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XSpinListener_idl__
#define __com_sun_star_awt_XSpinListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_SpinEvent_idl__
#include <com/sun/star/awt/SpinEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSpinValue.idl b/offapi/com/sun/star/awt/XSpinValue.idl
index be02f115a2c2..1876c30105c5 100644
--- a/offapi/com/sun/star/awt/XSpinValue.idl
+++ b/offapi/com/sun/star/awt/XSpinValue.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_XSpinValue_idl__
#define __com_sun_star_awt_XSpinValue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
#include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSystemChildFactory.idl b/offapi/com/sun/star/awt/XSystemChildFactory.idl
index 1c61ccd05e74..d267623fd017 100644
--- a/offapi/com/sun/star/awt/XSystemChildFactory.idl
+++ b/offapi/com/sun/star/awt/XSystemChildFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_awt_XSystemChildFactory_idl__
#define __com_sun_star_awt_XSystemChildFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
index 4f77905a0cfd..047453d41b7a 100644
--- a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XSystemDependentMenuPeer_idl__
#define __com_sun_star_awt_XSystemDependentMenuPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
index 9d1357fac9b6..dc721c159db2 100644
--- a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XSystemDependentWindowPeer_idl__
#define __com_sun_star_awt_XSystemDependentWindowPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTabController.idl b/offapi/com/sun/star/awt/XTabController.idl
index c5d36ed8238f..62310664d8bd 100644
--- a/offapi/com/sun/star/awt/XTabController.idl
+++ b/offapi/com/sun/star/awt/XTabController.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_awt_XTabController_idl__
#define __com_sun_star_awt_XTabController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlContainer_idl__
#include <com/sun/star/awt/XControlContainer.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTabControllerModel.idl b/offapi/com/sun/star/awt/XTabControllerModel.idl
index 275a72d379ed..c9482c4d52d9 100644
--- a/offapi/com/sun/star/awt/XTabControllerModel.idl
+++ b/offapi/com/sun/star/awt/XTabControllerModel.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#define __com_sun_star_awt_XTabControllerModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTabListener.idl b/offapi/com/sun/star/awt/XTabListener.idl
index 709f0f2c388c..470c8ea113ec 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_XTabListener_idl__
#define __com_sun_star_awt_XTabListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextArea.idl b/offapi/com/sun/star/awt/XTextArea.idl
index 051a74901303..7f7c3bb19339 100644
--- a/offapi/com/sun/star/awt/XTextArea.idl
+++ b/offapi/com/sun/star/awt/XTextArea.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XTextArea_idl__
#define __com_sun_star_awt_XTextArea_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextComponent.idl b/offapi/com/sun/star/awt/XTextComponent.idl
index 92bbc8e8d219..833a66d858ca 100644
--- a/offapi/com/sun/star/awt/XTextComponent.idl
+++ b/offapi/com/sun/star/awt/XTextComponent.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XTextComponent_idl__
#define __com_sun_star_awt_XTextComponent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XTextListener_idl__
#include <com/sun/star/awt/XTextListener.idl>
-#endif
-#ifndef __com_sun_star_awt_Selection_idl__
#include <com/sun/star/awt/Selection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextEditField.idl b/offapi/com/sun/star/awt/XTextEditField.idl
index b2898a72c6c7..e8dcc4154685 100644
--- a/offapi/com/sun/star/awt/XTextEditField.idl
+++ b/offapi/com/sun/star/awt/XTextEditField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XTextEditField_idl__
#define __com_sun_star_awt_XTextEditField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
index 144c8646b472..3cbe58721420 100644
--- a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
#define __com_sun_star_awt_XTextLayoutConstrains_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextListener.idl b/offapi/com/sun/star/awt/XTextListener.idl
index cd476068b1ef..ed7d1598b48c 100644
--- a/offapi/com/sun/star/awt/XTextListener.idl
+++ b/offapi/com/sun/star/awt/XTextListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XTextListener_idl__
#define __com_sun_star_awt_XTextListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_TextEvent_idl__
#include <com/sun/star/awt/TextEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 04dc6887cbe9..ba66a43ac7af 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_XThrobber_idl__
#define __com_sun_star_awt_XThrobber_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTimeField.idl b/offapi/com/sun/star/awt/XTimeField.idl
index d2efddd4fa2b..7a6df6df216a 100644
--- a/offapi/com/sun/star/awt/XTimeField.idl
+++ b/offapi/com/sun/star/awt/XTimeField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XTimeField_idl__
#define __com_sun_star_awt_XTimeField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XToggleButton.idl b/offapi/com/sun/star/awt/XToggleButton.idl
index 447eebd5806c..45f9afec8e56 100644
--- a/offapi/com/sun/star/awt/XToggleButton.idl
+++ b/offapi/com/sun/star/awt/XToggleButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XToggleButton_idl__
#define __com_sun_star_awt_XToggleButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
#include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XToolkit.idl b/offapi/com/sun/star/awt/XToolkit.idl
index c92d928403ce..37c6bbd5cbba 100644
--- a/offapi/com/sun/star/awt/XToolkit.idl
+++ b/offapi/com/sun/star/awt/XToolkit.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_awt_XToolkit_idl__
#define __com_sun_star_awt_XToolkit_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_WindowDescriptor_idl__
#include <com/sun/star/awt/WindowDescriptor.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
-#ifndef __com_sun_star_awt_XRegion_idl__
#include <com/sun/star/awt/XRegion.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTopWindow.idl b/offapi/com/sun/star/awt/XTopWindow.idl
index e74fc7e7ae7a..974761a8a52f 100644
--- a/offapi/com/sun/star/awt/XTopWindow.idl
+++ b/offapi/com/sun/star/awt/XTopWindow.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XTopWindow_idl__
#define __com_sun_star_awt_XTopWindow_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
#include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMenuBar_idl__
#include <com/sun/star/awt/XMenuBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XTopWindowListener.idl b/offapi/com/sun/star/awt/XTopWindowListener.idl
index 88929d2eec88..2f88c80328be 100644
--- a/offapi/com/sun/star/awt/XTopWindowListener.idl
+++ b/offapi/com/sun/star/awt/XTopWindowListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XTopWindowListener_idl__
#define __com_sun_star_awt_XTopWindowListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index b04802ee0728..b392f0014367 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_XUnitConversion_idl__
#define __com_sun_star_awt_XUnitConversion_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XUnoControlContainer.idl b/offapi/com/sun/star/awt/XUnoControlContainer.idl
index 2d28b7152246..371361b7c2a4 100644
--- a/offapi/com/sun/star/awt/XUnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/XUnoControlContainer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XUnoControlContainer_idl__
#define __com_sun_star_awt_XUnoControlContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index 18e2ff643db4..8814791fde1e 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_awt_XUserInputInterception_idl__
#define __com_sun_star_awt_XUserInputInterception_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
#include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
#include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/XVclContainer.idl b/offapi/com/sun/star/awt/XVclContainer.idl
index 9126ad18f912..8b3111c9241e 100644
--- a/offapi/com/sun/star/awt/XVclContainer.idl
+++ b/offapi/com/sun/star/awt/XVclContainer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XVclContainer_idl__
#define __com_sun_star_awt_XVclContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XVclContainerListener_idl__
#include <com/sun/star/awt/XVclContainerListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclContainerListener.idl b/offapi/com/sun/star/awt/XVclContainerListener.idl
index 160972dd3036..939bdedc77c9 100644
--- a/offapi/com/sun/star/awt/XVclContainerListener.idl
+++ b/offapi/com/sun/star/awt/XVclContainerListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XVclContainerListener_idl__
#define __com_sun_star_awt_XVclContainerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_VclContainerEvent_idl__
#include <com/sun/star/awt/VclContainerEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclContainerPeer.idl b/offapi/com/sun/star/awt/XVclContainerPeer.idl
index 363e580ac7dc..081192e0cac3 100644
--- a/offapi/com/sun/star/awt/XVclContainerPeer.idl
+++ b/offapi/com/sun/star/awt/XVclContainerPeer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XVclContainerPeer_idl__
#define __com_sun_star_awt_XVclContainerPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclWindowPeer.idl b/offapi/com/sun/star/awt/XVclWindowPeer.idl
index 1e5e03b58b1f..cb8541bd5280 100644
--- a/offapi/com/sun/star/awt/XVclWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XVclWindowPeer.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_XVclWindowPeer_idl__
#define __com_sun_star_awt_XVclWindowPeer_idl__
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XView.idl b/offapi/com/sun/star/awt/XView.idl
index f1092d71446a..93c14ed7120c 100644
--- a/offapi/com/sun/star/awt/XView.idl
+++ b/offapi/com/sun/star/awt/XView.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XView_idl__
#define __com_sun_star_awt_XView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XGraphics_idl__
#include <com/sun/star/awt/XGraphics.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindow.idl b/offapi/com/sun/star/awt/XWindow.idl
index 7742fd7b284d..ffba08dfaff4 100644
--- a/offapi/com/sun/star/awt/XWindow.idl
+++ b/offapi/com/sun/star/awt/XWindow.idl
@@ -27,37 +27,21 @@
#ifndef __com_sun_star_awt_XWindow_idl__
#define __com_sun_star_awt_XWindow_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowListener_idl__
#include <com/sun/star/awt/XWindowListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFocusListener_idl__
#include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XKeyListener_idl__
#include <com/sun/star/awt/XKeyListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
#include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
#include <com/sun/star/awt/XMouseMotionListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XPaintListener_idl__
#include <com/sun/star/awt/XPaintListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindow2.idl b/offapi/com/sun/star/awt/XWindow2.idl
index 0116ff88943b..3badb862fd04 100644
--- a/offapi/com/sun/star/awt/XWindow2.idl
+++ b/offapi/com/sun/star/awt/XWindow2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_XWindow2_idl__
#define __com_sun_star_awt_XWindow2_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
diff --git a/offapi/com/sun/star/awt/XWindowListener.idl b/offapi/com/sun/star/awt/XWindowListener.idl
index 2b7fb824d6fc..1546b44a7711 100644
--- a/offapi/com/sun/star/awt/XWindowListener.idl
+++ b/offapi/com/sun/star/awt/XWindowListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_awt_XWindowListener_idl__
#define __com_sun_star_awt_XWindowListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_WindowEvent_idl__
#include <com/sun/star/awt/WindowEvent.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindowListener2.idl b/offapi/com/sun/star/awt/XWindowListener2.idl
index 1313246664ef..575fe86ae1f5 100644
--- a/offapi/com/sun/star/awt/XWindowListener2.idl
+++ b/offapi/com/sun/star/awt/XWindowListener2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_XWindowListener2_idl__
#define __com_sun_star_awt_XWindowListener2_idl__
-#ifndef __com_sun_star_awt_XWindowListener_idl__
#include <com/sun/star/awt/XWindowListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindowPeer.idl b/offapi/com/sun/star/awt/XWindowPeer.idl
index cc734d0c8784..e21e9c133c5f 100644
--- a/offapi/com/sun/star/awt/XWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XWindowPeer.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_XWindowPeer_idl__
#define __com_sun_star_awt_XWindowPeer_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 36e41d9384f9..0c64be948b6f 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_DefaultGridColumnModel_idl__
#define __com_sun_star_awt_DefaultGridColumnModel_idl__
-#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__
#include <com/sun/star/awt/grid/XGridColumnModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index 383ff37eb673..25682223a41f 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_GridColumn_idl__
#define __com_sun_star_awt_GridColumn_idl__
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
#include <com/sun/star/awt/grid/XGridColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 22380b944a83..3353be3036cf 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
#define __com_sun_star_awt_grid_GridColumnEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
index e9fd149afcc2..167acd434cff 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__
#define __com_sun_star_awt_grid_GridInvalidDataException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
index db550a3ffc75..cd3cc9623e9e 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__
#define __com_sun_star_awt_grid_GridInvalidModelException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index e9b87c2fe7ed..fd67af6c4c1e 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_GridSelectionEvent_idl__
#define __com_sun_star_awt_GridSelectionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__
#include <com/sun/star/awt/grid/SelectionEventType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index 93c7ea646ca6..ee8c5b303e5e 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_UnoControlGrid_idl__
#define __com_sun_star_awt_UnoControlGrid_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-#ifndef __com_sun_star_awt_grid_XGridControl_idl__
#include <com/sun/star/awt/grid/XGridControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 434be67ed3f8..b868fd2228e6 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,7 +30,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/util/XCloneable.idl>
-
#include <com/sun/star/awt/grid/XGridColumn.idl>
#include <com/sun/star/container/XContainer.idl>
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index 9a324aee2668..60be14026bd9 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_grid_XGridDataListener_idl__
#define __com_sun_star_awt_grid_XGridDataListener_idl__
-#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
#include <com/sun/star/awt/grid/GridDataEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
index 61e8d3050b0d..2dba133f9d5d 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_grid_XGridSelectionListener_idl__
#define __com_sun_star_awt_grid_XGridSelectionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
#include <com/sun/star/awt/grid/GridSelectionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index ef678395fe06..be41dd9ad589 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_tab_TabPageActivationEvent_idl__
#define __com_sun_star_awt_tab_TabPageActivationEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
index cbee77879859..e1213fe7ec3d 100644
--- a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
+++ b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
#define __com_sun_star_awt_tree_ExpandVetoException_idl__
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
#include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
index adad5cf63830..f253b14e2e6b 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__
#define __com_sun_star_awt_tree_MutableTreeDataModel_idl__
-#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
#include <com/sun/star/awt/tree/XMutableTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
#include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
index c2db72d93bb6..8aca7b30f4c5 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_tree_MutableTreeNode_idl__
#define __com_sun_star_awt_tree_MutableTreeNode_idl__
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
#include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/TreeControl.idl b/offapi/com/sun/star/awt/tree/TreeControl.idl
index 79ed4b86ab90..cac1923660d3 100644
--- a/offapi/com/sun/star/awt/tree/TreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_awt_tree_TreeControl_idl__
#define __com_sun_star_awt_tree_TreeControl_idl__
-#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
#include <com/sun/star/awt/tree/XTreeControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/TreeControlModel.idl b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
index 9a6e70afe9b4..4a619cdb9712 100644
--- a/offapi/com/sun/star/awt/tree/TreeControlModel.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_tree_TreeControlModel_idl__
#define __com_sun_star_awt_tree_TreeControlModel_idl__
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
#include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_view_SelectionType_idl__
#include <com/sun/star/view/SelectionType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
index 380848950e6e..ea9273c09855 100644
--- a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
#define __com_sun_star_awt_tree_TreeDataModelEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
index 20ee645d56e8..35dc193875b0 100644
--- a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
#define __com_sun_star_awt_tree_TreeExpansionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
index cbea855eec6d..e44a3d2fc7be 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
#define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
#include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
#include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
index 5ec6c1e13f6b..cd280963a095 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
#define __com_sun_star_awt_tree_XMutableTreeNode_idl__
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeControl.idl b/offapi/com/sun/star/awt/tree/XTreeControl.idl
index edc135021fc4..d6831539c1de 100644
--- a/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
#define __com_sun_star_awt_tree_XTreeControl_idl__
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
#include <com/sun/star/awt/tree/XTreeExpansionListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
#include <com/sun/star/view/XMultiSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
#include <com/sun/star/awt/tree/XTreeEditListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
index 50f6dcae2151..aff76c481b75 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
#define __com_sun_star_awt_tree_XTreeDataModel_idl__
-#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
#include <com/sun/star/awt/tree/XTreeDataModelListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 5110dac3623e..c7857b796501 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
#define __com_sun_star_awt_tree_XTreeDataModelListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
#include <com/sun/star/awt/tree/TreeDataModelEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
index 2df5fcdcd438..f2ad14421f32 100644
--- a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
#define __com_sun_star_awt_tree_XTreeEditListener_idl__
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index 144825d532f4..c49d2f7a30be 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
#define __com_sun_star_awt_tree_XTreeExpansionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
#include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
#include <com/sun/star/awt/tree/ExpandVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeNode.idl b/offapi/com/sun/star/awt/tree/XTreeNode.idl
index b19af432f5d2..bd7e94144158 100644
--- a/offapi/com/sun/star/awt/tree/XTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeNode.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
#define __com_sun_star_awt_tree_XTreeNode_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef _com_sun_star_lang_IndexOutOfBoundsException_idl_
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================