summaryrefslogtreecommitdiff
path: root/offapi
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
parent3ab3374ed3863c7c6e329c56aabec31d6c908656 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi')
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleEventObject.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleRelation.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl2
-rw-r--r--offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessible.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleAction.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleComponent.idl16
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleContext.idl11
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEditableText.idl6
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEventListener.idl5
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl16
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleHypertext.idl6
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleImage.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl6
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl6
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl7
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleSelection.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleStateSet.idl5
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleTable.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleText.idl17
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl10
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleValue.idl2
-rw-r--r--offapi/com/sun/star/animations/Event.idl2
-rw-r--r--offapi/com/sun/star/animations/TargetProperties.idl2
-rw-r--r--offapi/com/sun/star/animations/XAnimate.idl5
-rw-r--r--offapi/com/sun/star/animations/XAnimateColor.idl2
-rw-r--r--offapi/com/sun/star/animations/XAnimateMotion.idl2
-rw-r--r--offapi/com/sun/star/animations/XAnimateSet.idl2
-rw-r--r--offapi/com/sun/star/animations/XAnimateTransform.idl2
-rw-r--r--offapi/com/sun/star/animations/XAnimationListener.idl4
-rw-r--r--offapi/com/sun/star/animations/XAnimationNode.idl5
-rw-r--r--offapi/com/sun/star/animations/XAnimationNodeSupplier.idl2
-rw-r--r--offapi/com/sun/star/animations/XAudio.idl2
-rw-r--r--offapi/com/sun/star/animations/XCommand.idl2
-rw-r--r--offapi/com/sun/star/animations/XIterateContainer.idl2
-rw-r--r--offapi/com/sun/star/animations/XTargetPropertiesCreator.idl4
-rw-r--r--offapi/com/sun/star/animations/XTimeContainer.idl14
-rw-r--r--offapi/com/sun/star/animations/XTransitionFilter.idl2
-rw-r--r--offapi/com/sun/star/auth/AuthenticationFailedException.idl2
-rw-r--r--offapi/com/sun/star/auth/InvalidArgumentException.idl2
-rw-r--r--offapi/com/sun/star/auth/InvalidContextException.idl2
-rw-r--r--offapi/com/sun/star/auth/InvalidCredentialException.idl2
-rw-r--r--offapi/com/sun/star/auth/InvalidPrincipalException.idl2
-rw-r--r--offapi/com/sun/star/auth/PersistenceFailureException.idl2
-rw-r--r--offapi/com/sun/star/auth/SSOExceptions.idl14
-rw-r--r--offapi/com/sun/star/auth/SSOManagerFactory.idl2
-rw-r--r--offapi/com/sun/star/auth/SSOPasswordCache.idl2
-rw-r--r--offapi/com/sun/star/auth/UnsupportedException.idl2
-rw-r--r--offapi/com/sun/star/auth/XSSOAcceptorContext.idl5
-rw-r--r--offapi/com/sun/star/auth/XSSOContext.idl2
-rw-r--r--offapi/com/sun/star/auth/XSSOInitiatorContext.idl5
-rw-r--r--offapi/com/sun/star/auth/XSSOManager.idl14
-rw-r--r--offapi/com/sun/star/auth/XSSOManagerFactory.idl5
-rw-r--r--offapi/com/sun/star/auth/XSSOPasswordCache.idl5
-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
-rw-r--r--offapi/com/sun/star/chart/AccessibleChartDocumentView.idl6
-rw-r--r--offapi/com/sun/star/chart/AccessibleChartElement.idl6
-rw-r--r--offapi/com/sun/star/chart/AreaDiagram.idl14
-rw-r--r--offapi/com/sun/star/chart/BarDiagram.idl20
-rw-r--r--offapi/com/sun/star/chart/BubbleDiagram.idl9
-rw-r--r--offapi/com/sun/star/chart/Chart3DBarProperties.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartArea.idl9
-rw-r--r--offapi/com/sun/star/chart/ChartAxis.idl29
-rw-r--r--offapi/com/sun/star/chart/ChartAxisXSupplier.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartAxisYSupplier.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartAxisZSupplier.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartData.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartDataArray.idl6
-rw-r--r--offapi/com/sun/star/chart/ChartDataChangeEvent.idl4
-rw-r--r--offapi/com/sun/star/chart/ChartDataPoint.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartDataPointProperties.idl13
-rw-r--r--offapi/com/sun/star/chart/ChartDataRow.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartDataRowProperties.idl8
-rw-r--r--offapi/com/sun/star/chart/ChartDocument.idl10
-rw-r--r--offapi/com/sun/star/chart/ChartGrid.idl6
-rw-r--r--offapi/com/sun/star/chart/ChartLegend.idl9
-rw-r--r--offapi/com/sun/star/chart/ChartLine.idl4
-rw-r--r--offapi/com/sun/star/chart/ChartPieSegmentProperties.idl4
-rw-r--r--offapi/com/sun/star/chart/ChartStatistics.idl12
-rw-r--r--offapi/com/sun/star/chart/ChartTableAddressSupplier.idl2
-rw-r--r--offapi/com/sun/star/chart/ChartTitle.idl5
-rw-r--r--offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl4
-rw-r--r--offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl4
-rw-r--r--offapi/com/sun/star/chart/Diagram.idl17
-rw-r--r--offapi/com/sun/star/chart/Dim3DDiagram.idl4
-rw-r--r--offapi/com/sun/star/chart/DonutDiagram.idl2
-rw-r--r--offapi/com/sun/star/chart/FilledNetDiagram.idl9
-rw-r--r--offapi/com/sun/star/chart/LineDiagram.idl17
-rw-r--r--offapi/com/sun/star/chart/NetDiagram.idl6
-rw-r--r--offapi/com/sun/star/chart/PieDiagram.idl4
-rw-r--r--offapi/com/sun/star/chart/StockDiagram.idl10
-rw-r--r--offapi/com/sun/star/chart/X3DDefaultSetter.idl2
-rw-r--r--offapi/com/sun/star/chart/X3DDisplay.idl4
-rw-r--r--offapi/com/sun/star/chart/XAxis.idl2
-rw-r--r--offapi/com/sun/star/chart/XAxisSupplier.idl2
-rw-r--r--offapi/com/sun/star/chart/XAxisXSupplier.idl6
-rw-r--r--offapi/com/sun/star/chart/XAxisYSupplier.idl6
-rw-r--r--offapi/com/sun/star/chart/XAxisZSupplier.idl6
-rw-r--r--offapi/com/sun/star/chart/XChartData.idl4
-rw-r--r--offapi/com/sun/star/chart/XChartDataArray.idl2
-rw-r--r--offapi/com/sun/star/chart/XChartDataChangeEventListener.idl4
-rw-r--r--offapi/com/sun/star/chart/XChartDocument.idl10
-rw-r--r--offapi/com/sun/star/chart/XComplexDescriptionAccess.idl2
-rw-r--r--offapi/com/sun/star/chart/XDiagram.idl6
-rw-r--r--offapi/com/sun/star/chart/XDiagramPositioning.idl4
-rw-r--r--offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl5
-rw-r--r--offapi/com/sun/star/chart/XStatisticDisplay.idl4
-rw-r--r--offapi/com/sun/star/chart/XTwoAxisXSupplier.idl4
-rw-r--r--offapi/com/sun/star/chart/XTwoAxisYSupplier.idl4
-rw-r--r--offapi/com/sun/star/chart/XYDiagram.idl10
-rw-r--r--offapi/com/sun/star/chart2/Axis.idl3
-rw-r--r--offapi/com/sun/star/chart2/ChartDocument.idl2
-rw-r--r--offapi/com/sun/star/chart2/ChartType.idl1
-rw-r--r--offapi/com/sun/star/chart2/CoordinateSystem.idl11
-rw-r--r--offapi/com/sun/star/chart2/DataPoint.idl1
-rw-r--r--offapi/com/sun/star/chart2/DataPointProperties.idl2
-rw-r--r--offapi/com/sun/star/chart2/DataSeries.idl1
-rw-r--r--offapi/com/sun/star/chart2/Diagram.idl3
-rw-r--r--offapi/com/sun/star/chart2/ExponentialScaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/FillBitmap.idl9
-rw-r--r--offapi/com/sun/star/chart2/FormattedString.idl4
-rw-r--r--offapi/com/sun/star/chart2/GridProperties.idl2
-rw-r--r--offapi/com/sun/star/chart2/Legend.idl1
-rw-r--r--offapi/com/sun/star/chart2/LinearScaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/LogarithmicScaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/PowerScaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/RelativePosition.idl2
-rw-r--r--offapi/com/sun/star/chart2/Scaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl2
-rw-r--r--offapi/com/sun/star/chart2/Symbol.idl4
-rw-r--r--offapi/com/sun/star/chart2/Title.idl2
-rw-r--r--offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl2
-rw-r--r--offapi/com/sun/star/chart2/XAxis.idl4
-rw-r--r--offapi/com/sun/star/chart2/XChartShape.idl20
-rw-r--r--offapi/com/sun/star/chart2/XChartShapeContainer.idl5
-rw-r--r--offapi/com/sun/star/chart2/XChartType.idl6
-rw-r--r--offapi/com/sun/star/chart2/XChartTypeContainer.idl8
-rw-r--r--offapi/com/sun/star/chart2/XChartTypeManager.idl1
-rw-r--r--offapi/com/sun/star/chart2/XChartTypeTemplate.idl8
-rw-r--r--offapi/com/sun/star/chart2/XCoordinateSystem.idl6
-rw-r--r--offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl6
-rw-r--r--offapi/com/sun/star/chart2/XDataInterpreter.idl5
-rw-r--r--offapi/com/sun/star/chart2/XDataSeries.idl8
-rw-r--r--offapi/com/sun/star/chart2/XDataSeriesContainer.idl8
-rw-r--r--offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl5
-rw-r--r--offapi/com/sun/star/chart2/XDiagram.idl3
-rw-r--r--offapi/com/sun/star/chart2/XDiagramProvider.idl3
-rw-r--r--offapi/com/sun/star/chart2/XFastPropertyState.idl11
-rw-r--r--offapi/com/sun/star/chart2/XFormattedString.idl2
-rw-r--r--offapi/com/sun/star/chart2/XLabeled.idl8
-rw-r--r--offapi/com/sun/star/chart2/XRegressionCurve.idl1
-rw-r--r--offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl1
-rw-r--r--offapi/com/sun/star/chart2/XRegressionCurveContainer.idl6
-rw-r--r--offapi/com/sun/star/chart2/XScaling.idl2
-rw-r--r--offapi/com/sun/star/chart2/XStyleSupplier.idl6
-rw-r--r--offapi/com/sun/star/chart2/XTarget.idl2
-rw-r--r--offapi/com/sun/star/chart2/XTitle.idl3
-rw-r--r--offapi/com/sun/star/chart2/XTitled.idl3
-rw-r--r--offapi/com/sun/star/chart2/XTransformation.idl5
-rw-r--r--offapi/com/sun/star/chart2/data/DataSequence.idl2
-rw-r--r--offapi/com/sun/star/chart2/data/LabeledDataSequence.idl1
-rw-r--r--offapi/com/sun/star/chart2/data/XDataProvider.idl3
-rw-r--r--offapi/com/sun/star/chart2/data/XDataReceiver.idl16
-rw-r--r--offapi/com/sun/star/chart2/data/XDataSink.idl1
-rw-r--r--offapi/com/sun/star/chart2/data/XDataSource.idl1
-rw-r--r--offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl2
-rw-r--r--offapi/com/sun/star/chart2/data/XRangeHighlighter.idl8
-rw-r--r--offapi/com/sun/star/configuration/AccessRootElement.idl11
-rw-r--r--offapi/com/sun/star/configuration/AdministrationProvider.idl5
-rw-r--r--offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl2
-rw-r--r--offapi/com/sun/star/configuration/ConfigurationAccess.idl20
-rw-r--r--offapi/com/sun/star/configuration/ConfigurationProvider.idl5
-rw-r--r--offapi/com/sun/star/configuration/ConfigurationRegistry.idl4
-rw-r--r--offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl11
-rw-r--r--offapi/com/sun/star/configuration/CorruptedConfigurationException.idl2
-rw-r--r--offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl2
-rw-r--r--offapi/com/sun/star/configuration/DefaultProvider.idl11
-rw-r--r--offapi/com/sun/star/configuration/GroupAccess.idl11
-rw-r--r--offapi/com/sun/star/configuration/GroupElement.idl5
-rw-r--r--offapi/com/sun/star/configuration/GroupUpdate.idl5
-rw-r--r--offapi/com/sun/star/configuration/HierarchyAccess.idl20
-rw-r--r--offapi/com/sun/star/configuration/HierarchyElement.idl14
-rw-r--r--offapi/com/sun/star/configuration/InstallationIncompleteException.idl2
-rw-r--r--offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl2
-rw-r--r--offapi/com/sun/star/configuration/MissingBootstrapFileException.idl2
-rw-r--r--offapi/com/sun/star/configuration/PropertyHierarchy.idl11
-rw-r--r--offapi/com/sun/star/configuration/SetAccess.idl8
-rw-r--r--offapi/com/sun/star/configuration/SetElement.idl11
-rw-r--r--offapi/com/sun/star/configuration/SetUpdate.idl5
-rw-r--r--offapi/com/sun/star/configuration/SimpleSetAccess.idl11
-rw-r--r--offapi/com/sun/star/configuration/SimpleSetUpdate.idl11
-rw-r--r--offapi/com/sun/star/configuration/UpdateRootElement.idl5
-rw-r--r--offapi/com/sun/star/configuration/XTemplateContainer.idl2
-rw-r--r--offapi/com/sun/star/configuration/XTemplateInstance.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/Backend.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/BackendAccessException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/BackendAdapter.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/BackendSetupException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/CannotConnectException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/ConnectionLostException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/CopyImporter.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/DataImporter.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/DefaultBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/Importer.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/Layer.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/LayerDescriber.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/LayerFilter.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LocalDataImporter.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/MalformedDataException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/MergeImporter.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/OfflineBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/OnlineBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/PlatformBackend.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/Schema.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/SchemaSupplier.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/SingleBackend.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/StratumCreationException.idl2
-rw-r--r--offapi/com/sun/star/configuration/backend/SystemIntegration.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/UpdatableLayer.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/XBackend.idl20
-rw-r--r--offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl5
-rw-r--r--offapi/com/sun/star/configuration/backend/XBackendEntities.idl7
-rw-r--r--offapi/com/sun/star/configuration/backend/XCompositeLayer.idl14
-rw-r--r--offapi/com/sun/star/configuration/backend/XLayer.idl14
-rw-r--r--offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl14
-rw-r--r--offapi/com/sun/star/configuration/backend/XLayerHandler.idl10
-rw-r--r--offapi/com/sun/star/configuration/backend/XLayerImporter.idl17
-rw-r--r--offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl17
-rw-r--r--offapi/com/sun/star/configuration/backend/XSchema.idl14
-rw-r--r--offapi/com/sun/star/configuration/backend/XSchemaHandler.idl10
-rw-r--r--offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl11
-rw-r--r--offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl17
-rw-r--r--offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl11
-rw-r--r--offapi/com/sun/star/configuration/backend/XUpdateHandler.idl13
-rw-r--r--offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/xml/LayerParser.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl8
-rw-r--r--offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl8
-rw-r--r--offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/DataFormatTranslator.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl8
-rw-r--r--offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/XMimeContentType.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl8
-rw-r--r--offapi/com/sun/star/datatransfer/XSystemTransferable.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferDataAccess.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferable.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferableEx.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferableSource.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferableSupplier.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl8
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDragSource.idl11
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl2
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl8
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl5
-rw-r--r--offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl8
-rw-r--r--offapi/com/sun/star/document/AmbigousFilterRequest.idl2
-rw-r--r--offapi/com/sun/star/document/BrokenPackageRequest.idl2
-rw-r--r--offapi/com/sun/star/document/ChangedByOthersRequest.idl8
-rw-r--r--offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl2
-rw-r--r--offapi/com/sun/star/document/DocumentEvent.idl4
-rw-r--r--offapi/com/sun/star/document/DocumentInfo.idl22
-rw-r--r--offapi/com/sun/star/document/DocumentProperties.idl2
-rw-r--r--offapi/com/sun/star/document/DocumentRevisionListPersistence.idl2
-rw-r--r--offapi/com/sun/star/document/EventObject.idl2
-rw-r--r--offapi/com/sun/star/document/Events.idl2
-rw-r--r--offapi/com/sun/star/document/ExportFilter.idl11
-rw-r--r--offapi/com/sun/star/document/ExtendedTypeDetection.idl2
-rw-r--r--offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl11
-rw-r--r--offapi/com/sun/star/document/FilterAdapter.idl2
-rw-r--r--offapi/com/sun/star/document/FilterFactory.idl11
-rw-r--r--offapi/com/sun/star/document/FilterOptionsRequest.idl8
-rw-r--r--offapi/com/sun/star/document/HeaderFooterSettings.idl2
-rw-r--r--offapi/com/sun/star/document/ImportFilter.idl11
-rw-r--r--offapi/com/sun/star/document/LinkTarget.idl4
-rw-r--r--offapi/com/sun/star/document/LinkTargets.idl2
-rw-r--r--offapi/com/sun/star/document/LockFileIgnoreRequest.idl8
-rw-r--r--offapi/com/sun/star/document/LockedDocumentRequest.idl8
-rw-r--r--offapi/com/sun/star/document/LockedOnSavingRequest.idl8
-rw-r--r--offapi/com/sun/star/document/MediaDescriptor.idl23
-rw-r--r--offapi/com/sun/star/document/NoSuchFilterRequest.idl2
-rw-r--r--offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl2
-rw-r--r--offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl2
-rw-r--r--offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl8
-rw-r--r--offapi/com/sun/star/document/PDFDialog.idl2
-rw-r--r--offapi/com/sun/star/document/Settings.idl4
-rw-r--r--offapi/com/sun/star/document/StandaloneDocumentInfo.idl5
-rw-r--r--offapi/com/sun/star/document/TypeDetection.idl11
-rw-r--r--offapi/com/sun/star/document/XActionLockable.idl2
-rw-r--r--offapi/com/sun/star/document/XBinaryStreamResolver.idl6
-rw-r--r--offapi/com/sun/star/document/XCodeNameQuery.idl2
-rw-r--r--offapi/com/sun/star/document/XCompatWriterDocProperties.idl2
-rw-r--r--offapi/com/sun/star/document/XDocumentEventBroadcaster.idl11
-rw-r--r--offapi/com/sun/star/document/XDocumentEventListener.idl5
-rw-r--r--offapi/com/sun/star/document/XDocumentInfo.idl5
-rw-r--r--offapi/com/sun/star/document/XDocumentInfoSupplier.idl5
-rw-r--r--offapi/com/sun/star/document/XDocumentInsertable.idl8
-rw-r--r--offapi/com/sun/star/document/XDocumentLanguages.idl8
-rw-r--r--offapi/com/sun/star/document/XDocumentProperties.idl26
-rw-r--r--offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl5
-rw-r--r--offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl19
-rw-r--r--offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl5
-rw-r--r--offapi/com/sun/star/document/XEmbeddedObjectResolver.idl2
-rw-r--r--offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl4
-rw-r--r--offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl7
-rw-r--r--offapi/com/sun/star/document/XEmbeddedScripts.idl2
-rw-r--r--offapi/com/sun/star/document/XEventBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/document/XEventListener.idl5
-rw-r--r--offapi/com/sun/star/document/XEventsSupplier.idl2
-rw-r--r--offapi/com/sun/star/document/XExporter.idl5
-rw-r--r--offapi/com/sun/star/document/XExtendedFilterDetection.idl5
-rw-r--r--offapi/com/sun/star/document/XFilter.idl5
-rw-r--r--offapi/com/sun/star/document/XFilterAdapter.idl3
-rw-r--r--offapi/com/sun/star/document/XGraphicObjectResolver.idl2
-rw-r--r--offapi/com/sun/star/document/XImporter.idl5
-rw-r--r--offapi/com/sun/star/document/XInteractionFilterOptions.idl5
-rw-r--r--offapi/com/sun/star/document/XInteractionFilterSelect.idl2
-rw-r--r--offapi/com/sun/star/document/XLinkTargetSupplier.idl4
-rw-r--r--offapi/com/sun/star/document/XMLBasicExporter.idl8
-rw-r--r--offapi/com/sun/star/document/XMLBasicImporter.idl5
-rw-r--r--offapi/com/sun/star/document/XMLOasisBasicExporter.idl8
-rw-r--r--offapi/com/sun/star/document/XMLOasisBasicImporter.idl5
-rw-r--r--offapi/com/sun/star/document/XMimeTypeInfo.idl2
-rw-r--r--offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl14
-rw-r--r--offapi/com/sun/star/document/XRedlinesSupplier.idl2
-rw-r--r--offapi/com/sun/star/document/XScriptInvocationContext.idl2
-rw-r--r--offapi/com/sun/star/document/XStandaloneDocumentInfo.idl5
-rw-r--r--offapi/com/sun/star/document/XStorageBasedDocument.idl20
-rw-r--r--offapi/com/sun/star/document/XStorageChangeListener.idl8
-rw-r--r--offapi/com/sun/star/document/XTypeDetection.idl5
-rw-r--r--offapi/com/sun/star/document/XVbaMethodParameter.idl2
-rw-r--r--offapi/com/sun/star/document/XViewDataSupplier.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl6
-rw-r--r--offapi/com/sun/star/drawing/AccessibleGraphicShape.idl5
-rw-r--r--offapi/com/sun/star/drawing/AccessibleImageBullet.idl8
-rw-r--r--offapi/com/sun/star/drawing/AccessibleOLEShape.idl5
-rw-r--r--offapi/com/sun/star/drawing/AccessibleShape.idl6
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideView.idl8
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl8
-rw-r--r--offapi/com/sun/star/drawing/AppletShape.idl5
-rw-r--r--offapi/com/sun/star/drawing/Background.idl2
-rw-r--r--offapi/com/sun/star/drawing/BezierPoint.idl2
-rw-r--r--offapi/com/sun/star/drawing/BitmapTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/BoundVolume.idl2
-rw-r--r--offapi/com/sun/star/drawing/CameraGeometry.idl5
-rw-r--r--offapi/com/sun/star/drawing/CaptionShape.idl17
-rw-r--r--offapi/com/sun/star/drawing/ClosedBezierShape.idl14
-rw-r--r--offapi/com/sun/star/drawing/ConnectorProperties.idl2
-rw-r--r--offapi/com/sun/star/drawing/ConnectorShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/ControlShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/CustomShape.idl17
-rw-r--r--offapi/com/sun/star/drawing/CustomShapeEngine.idl4
-rw-r--r--offapi/com/sun/star/drawing/DashTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/Defaults.idl17
-rw-r--r--offapi/com/sun/star/drawing/DocumentSettings.idl5
-rw-r--r--offapi/com/sun/star/drawing/DoubleSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawPage.idl7
-rw-r--r--offapi/com/sun/star/drawing/DrawPages.idl6
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocument.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl19
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocumentFactory.idl2
-rw-r--r--offapi/com/sun/star/drawing/EllipseShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl16
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl10
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl13
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl2
-rw-r--r--offapi/com/sun/star/drawing/FillProperties.idl20
-rw-r--r--offapi/com/sun/star/drawing/FlagSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/FlagSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/GenericDrawPage.idl18
-rw-r--r--offapi/com/sun/star/drawing/GenericDrawingDocument.idl32
-rw-r--r--offapi/com/sun/star/drawing/GluePoint.idl2
-rw-r--r--offapi/com/sun/star/drawing/GluePoint2.idl8
-rw-r--r--offapi/com/sun/star/drawing/GradientTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/GraphicExportFilter.idl8
-rw-r--r--offapi/com/sun/star/drawing/GraphicFilterRequest.idl2
-rw-r--r--offapi/com/sun/star/drawing/GraphicObjectShape.idl18
-rw-r--r--offapi/com/sun/star/drawing/GroupShape.idl7
-rw-r--r--offapi/com/sun/star/drawing/Hatch.idl4
-rw-r--r--offapi/com/sun/star/drawing/HatchTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix3.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix4.idl2
-rw-r--r--offapi/com/sun/star/drawing/Layer.idl2
-rw-r--r--offapi/com/sun/star/drawing/LayerManager.idl4
-rw-r--r--offapi/com/sun/star/drawing/LineDash.idl2
-rw-r--r--offapi/com/sun/star/drawing/LineProperties.idl14
-rw-r--r--offapi/com/sun/star/drawing/LineShape.idl12
-rw-r--r--offapi/com/sun/star/drawing/MarkerTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/MasterPage.idl2
-rw-r--r--offapi/com/sun/star/drawing/MasterPages.idl2
-rw-r--r--offapi/com/sun/star/drawing/MeasureProperties.idl6
-rw-r--r--offapi/com/sun/star/drawing/MeasureShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/OLE2Shape.idl8
-rw-r--r--offapi/com/sun/star/drawing/OpenBezierShape.idl12
-rw-r--r--offapi/com/sun/star/drawing/PageShape.idl2
-rw-r--r--offapi/com/sun/star/drawing/PluginShape.idl5
-rw-r--r--offapi/com/sun/star/drawing/PointSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/PointSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/PolyLineShape.idl12
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl4
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl4
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl4
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape3D.idl2
-rw-r--r--offapi/com/sun/star/drawing/RectangleShape.idl13
-rw-r--r--offapi/com/sun/star/drawing/ShadowProperties.idl2
-rw-r--r--offapi/com/sun/star/drawing/Shape.idl23
-rw-r--r--offapi/com/sun/star/drawing/ShapeCollection.idl5
-rw-r--r--offapi/com/sun/star/drawing/Shapes.idl2
-rw-r--r--offapi/com/sun/star/drawing/SlideRenderer.idl2
-rw-r--r--offapi/com/sun/star/drawing/SlideSorter.idl12
-rw-r--r--offapi/com/sun/star/drawing/Text.idl4
-rw-r--r--offapi/com/sun/star/drawing/TextProperties.idl34
-rw-r--r--offapi/com/sun/star/drawing/TextShape.idl14
-rw-r--r--offapi/com/sun/star/drawing/TransparencyGradientTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/XConnectableShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/XConnectorShape.idl6
-rw-r--r--offapi/com/sun/star/drawing/XControlShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/XCustomShapeEngine.idl10
-rw-r--r--offapi/com/sun/star/drawing/XCustomShapeHandle.idl5
-rw-r--r--offapi/com/sun/star/drawing/XDrawPage.idl2
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageDuplicator.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageExpander.idl6
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSummarizer.idl6
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPages.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPagesSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawSubController.idl8
-rw-r--r--offapi/com/sun/star/drawing/XDrawView.idl4
-rw-r--r--offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl2
-rw-r--r--offapi/com/sun/star/drawing/XGluePointsSupplier.idl2
-rw-r--r--offapi/com/sun/star/drawing/XLayer.idl2
-rw-r--r--offapi/com/sun/star/drawing/XLayerManager.idl8
-rw-r--r--offapi/com/sun/star/drawing/XLayerSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XMasterPageTarget.idl4
-rw-r--r--offapi/com/sun/star/drawing/XMasterPagesSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XPresenterHelper.idl8
-rw-r--r--offapi/com/sun/star/drawing/XSelectionFunction.idl22
-rw-r--r--offapi/com/sun/star/drawing/XShape.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeAligner.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeArranger.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeBinder.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeCombiner.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeDescriptor.idl2
-rw-r--r--offapi/com/sun/star/drawing/XShapeGroup.idl2
-rw-r--r--offapi/com/sun/star/drawing/XShapeGrouper.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeMirror.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapes.idl4
-rw-r--r--offapi/com/sun/star/drawing/XSlidePreviewCache.idl10
-rw-r--r--offapi/com/sun/star/drawing/XSlideRenderer.idl8
-rw-r--r--offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicViewFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/Configuration.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/ConfigurationController.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/ModuleController.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/ResourceId.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfiguration.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationController.idl10
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XControllerManager.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XModuleController.idl8
-rw-r--r--offapi/com/sun/star/drawing/framework/XPane.idl8
-rw-r--r--offapi/com/sun/star/drawing/framework/XPane2.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XRelocatableResource.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XResource.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceFactory.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceId.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XTabBar.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XToolBar.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XView.idl4
-rw-r--r--offapi/com/sun/star/embed/BaseStorage.idl5
-rw-r--r--offapi/com/sun/star/embed/DocumentCloser.idl10
-rw-r--r--offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl18
-rw-r--r--offapi/com/sun/star/embed/FileSystemStorage.idl2
-rw-r--r--offapi/com/sun/star/embed/FileSystemStorageFactory.idl2
-rw-r--r--offapi/com/sun/star/embed/InsertedObjectInfo.idl5
-rw-r--r--offapi/com/sun/star/embed/InstanceLocker.idl10
-rw-r--r--offapi/com/sun/star/embed/InvalidStorageException.idl2
-rw-r--r--offapi/com/sun/star/embed/LinkageMisuseException.idl2
-rw-r--r--offapi/com/sun/star/embed/NeedsRunningStateException.idl2
-rw-r--r--offapi/com/sun/star/embed/NoVisualAreaSizeException.idl2
-rw-r--r--offapi/com/sun/star/embed/OLESimpleStorage.idl8
-rw-r--r--offapi/com/sun/star/embed/ObjectSaveVetoException.idl2
-rw-r--r--offapi/com/sun/star/embed/StateChangeInProgressException.idl2
-rw-r--r--offapi/com/sun/star/embed/Storage.idl23
-rw-r--r--offapi/com/sun/star/embed/StorageFactory.idl2
-rw-r--r--offapi/com/sun/star/embed/StorageStream.idl14
-rw-r--r--offapi/com/sun/star/embed/StorageWrappedTargetException.idl2
-rw-r--r--offapi/com/sun/star/embed/UnreachableStateException.idl2
-rw-r--r--offapi/com/sun/star/embed/UseBackupException.idl2
-rw-r--r--offapi/com/sun/star/embed/VisualRepresentation.idl2
-rw-r--r--offapi/com/sun/star/embed/WrongStateException.idl2
-rw-r--r--offapi/com/sun/star/embed/XActionsApproval.idl2
-rw-r--r--offapi/com/sun/star/embed/XClassifiedObject.idl5
-rw-r--r--offapi/com/sun/star/embed/XCommonEmbedPersist.idl17
-rw-r--r--offapi/com/sun/star/embed/XComponentSupplier.idl2
-rw-r--r--offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl20
-rw-r--r--offapi/com/sun/star/embed/XEmbedObjectCreator.idl17
-rw-r--r--offapi/com/sun/star/embed/XEmbedObjectFactory.idl17
-rw-r--r--offapi/com/sun/star/embed/XEmbedPersist.idl20
-rw-r--r--offapi/com/sun/star/embed/XEmbeddedClient.idl11
-rw-r--r--offapi/com/sun/star/embed/XEmbeddedObject.idl41
-rw-r--r--offapi/com/sun/star/embed/XEncryptionProtectedSource.idl5
-rw-r--r--offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl5
-rw-r--r--offapi/com/sun/star/embed/XExtendedStorageStream.idl20
-rw-r--r--offapi/com/sun/star/embed/XHatchWindow.idl8
-rw-r--r--offapi/com/sun/star/embed/XHatchWindowController.idl5
-rw-r--r--offapi/com/sun/star/embed/XHatchWindowFactory.idl14
-rw-r--r--offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl35
-rw-r--r--offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl5
-rw-r--r--offapi/com/sun/star/embed/XInplaceClient.idl26
-rw-r--r--offapi/com/sun/star/embed/XInplaceObject.idl11
-rw-r--r--offapi/com/sun/star/embed/XInsertObjectDialog.idl20
-rw-r--r--offapi/com/sun/star/embed/XLinkCreator.idl17
-rw-r--r--offapi/com/sun/star/embed/XLinkFactory.idl17
-rw-r--r--offapi/com/sun/star/embed/XLinkageSupport.idl14
-rw-r--r--offapi/com/sun/star/embed/XOLESimpleStorage.idl14
-rw-r--r--offapi/com/sun/star/embed/XOptimizedStorage.idl44
-rw-r--r--offapi/com/sun/star/embed/XPackageStructureCreator.idl5
-rw-r--r--offapi/com/sun/star/embed/XPersistanceHolder.idl8
-rw-r--r--offapi/com/sun/star/embed/XRelationshipAccess.idl14
-rw-r--r--offapi/com/sun/star/embed/XStateChangeBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/embed/XStateChangeListener.idl6
-rw-r--r--offapi/com/sun/star/embed/XStorage.idl41
-rw-r--r--offapi/com/sun/star/embed/XStorage2.idl5
-rw-r--r--offapi/com/sun/star/embed/XStorageRawAccess.idl32
-rw-r--r--offapi/com/sun/star/embed/XTransactedObject.idl8
-rw-r--r--offapi/com/sun/star/embed/XTransactionBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/embed/XTransactionListener.idl6
-rw-r--r--offapi/com/sun/star/embed/XTransferableSupplier.idl2
-rw-r--r--offapi/com/sun/star/embed/XVisualObject.idl14
-rw-r--r--offapi/com/sun/star/embed/XWindowSupplier.idl2
-rw-r--r--offapi/com/sun/star/form/DataAwareControlModel.idl10
-rw-r--r--offapi/com/sun/star/form/DatabaseDeleteEvent.idl2
-rw-r--r--offapi/com/sun/star/form/DatabaseParameterEvent.idl4
-rw-r--r--offapi/com/sun/star/form/ErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/form/FormComponent.idl12
-rw-r--r--offapi/com/sun/star/form/FormComponents.idl12
-rw-r--r--offapi/com/sun/star/form/FormControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/FormController.idl26
-rw-r--r--offapi/com/sun/star/form/FormControllerDispatcher.idl2
-rw-r--r--offapi/com/sun/star/form/Forms.idl11
-rw-r--r--offapi/com/sun/star/form/PropertyBrowserController.idl11
-rw-r--r--offapi/com/sun/star/form/XApproveActionBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XApproveActionListener.idl4
-rw-r--r--offapi/com/sun/star/form/XBoundComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XBoundControl.idl2
-rw-r--r--offapi/com/sun/star/form/XChangeBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XChangeListener.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl2
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorListener.idl4
-rw-r--r--offapi/com/sun/star/form/XForm.idl2
-rw-r--r--offapi/com/sun/star/form/XFormComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XFormController.idl6
-rw-r--r--offapi/com/sun/star/form/XFormControllerListener.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier2.idl2
-rw-r--r--offapi/com/sun/star/form/XGrid.idl2
-rw-r--r--offapi/com/sun/star/form/XGridColumnFactory.idl6
-rw-r--r--offapi/com/sun/star/form/XGridFieldDataSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XGridPeer.idl4
-rw-r--r--offapi/com/sun/star/form/XImageProducerSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XInsertListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadable.idl4
-rw-r--r--offapi/com/sun/star/form/XPositioningListener.idl4
-rw-r--r--offapi/com/sun/star/form/XReset.idl4
-rw-r--r--offapi/com/sun/star/form/XResetListener.idl4
-rw-r--r--offapi/com/sun/star/form/XRestoreListener.idl4
-rw-r--r--offapi/com/sun/star/form/XSubmit.idl8
-rw-r--r--offapi/com/sun/star/form/XSubmitListener.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableControlModel.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl2
-rw-r--r--offapi/com/sun/star/form/binding/IncompatibleTypesException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/InvalidBindingStateException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntryEvent.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/ValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/binding/XBindableValue.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntryListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySink.idl2
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/XValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/component/CheckBox.idl8
-rw-r--r--offapi/com/sun/star/form/component/ComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/CurrencyField.idl6
-rw-r--r--offapi/com/sun/star/form/component/DataForm.idl20
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCheckBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCurrencyField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseDateField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseFormattedField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseImageControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseNumericField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabasePatternField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseRadioButton.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTextField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTimeField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DateField.idl6
-rw-r--r--offapi/com/sun/star/form/component/FileControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/FixedText.idl4
-rw-r--r--offapi/com/sun/star/form/component/Form.idl14
-rw-r--r--offapi/com/sun/star/form/component/FormattedField.idl6
-rw-r--r--offapi/com/sun/star/form/component/GridControl.idl26
-rw-r--r--offapi/com/sun/star/form/component/GroupBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/HTMLForm.idl10
-rw-r--r--offapi/com/sun/star/form/component/HiddenControl.idl2
-rw-r--r--offapi/com/sun/star/form/component/ImageButton.idl10
-rw-r--r--offapi/com/sun/star/form/component/ListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/NavigationToolBar.idl4
-rw-r--r--offapi/com/sun/star/form/component/NumericField.idl6
-rw-r--r--offapi/com/sun/star/form/component/PatternField.idl6
-rw-r--r--offapi/com/sun/star/form/component/RadioButton.idl6
-rw-r--r--offapi/com/sun/star/form/component/RichTextControl.idl8
-rw-r--r--offapi/com/sun/star/form/component/ScrollBar.idl8
-rw-r--r--offapi/com/sun/star/form/component/SpinButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/SubmitButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/TextField.idl10
-rw-r--r--offapi/com/sun/star/form/component/TimeField.idl6
-rw-r--r--offapi/com/sun/star/form/control/CheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/CommandButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/CurrencyField.idl5
-rw-r--r--offapi/com/sun/star/form/control/DateField.idl5
-rw-r--r--offapi/com/sun/star/form/control/FormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/control/GridControl.idl32
-rw-r--r--offapi/com/sun/star/form/control/GroupBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageControl.idl5
-rw-r--r--offapi/com/sun/star/form/control/InteractionGridControl.idl4
-rw-r--r--offapi/com/sun/star/form/control/ListBox.idl8
-rw-r--r--offapi/com/sun/star/form/control/NavigationToolBar.idl2
-rw-r--r--offapi/com/sun/star/form/control/NumericField.idl5
-rw-r--r--offapi/com/sun/star/form/control/PatternField.idl5
-rw-r--r--offapi/com/sun/star/form/control/RadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/SubmitButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/TextField.idl7
-rw-r--r--offapi/com/sun/star/form/control/TimeField.idl5
-rw-r--r--offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/EditPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/EventHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/FormOperations.idl8
-rw-r--r--offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/XFormOperations.idl17
-rw-r--r--offapi/com/sun/star/form/submission/XSubmission.idl10
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionSupplier.idl2
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl4
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatable.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatableFormComponent.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XValidator.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidityConstraintListener.idl2
-rw-r--r--offapi/com/sun/star/formula/AccessibleFormulaText.idl11
-rw-r--r--offapi/com/sun/star/formula/AccessibleFormulaView.idl11
-rw-r--r--offapi/com/sun/star/frame/Components.idl2
-rw-r--r--offapi/com/sun/star/frame/ContentHandler.idl2
-rw-r--r--offapi/com/sun/star/frame/ContentHandlerFactory.idl8
-rw-r--r--offapi/com/sun/star/frame/ControlCommand.idl2
-rw-r--r--offapi/com/sun/star/frame/ControlEvent.idl4
-rw-r--r--offapi/com/sun/star/frame/Controller.idl20
-rw-r--r--offapi/com/sun/star/frame/Desktop.idl14
-rw-r--r--offapi/com/sun/star/frame/DesktopTask.idl20
-rw-r--r--offapi/com/sun/star/frame/DesktopTasks.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchDescriptor.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchHelper.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchInformation.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchProvider.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchRecorder.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchRecorderSupplier.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchResultEvent.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchStatement.idl2
-rw-r--r--offapi/com/sun/star/frame/DocumentTemplates.idl2
-rw-r--r--offapi/com/sun/star/frame/DoubleInitializationException.idl2
-rw-r--r--offapi/com/sun/star/frame/FeatureStateEvent.idl5
-rw-r--r--offapi/com/sun/star/frame/Frame.idl26
-rw-r--r--offapi/com/sun/star/frame/FrameActionEvent.idl8
-rw-r--r--offapi/com/sun/star/frame/FrameControl.idl5
-rw-r--r--offapi/com/sun/star/frame/FrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/FrameLoaderFactory.idl8
-rw-r--r--offapi/com/sun/star/frame/FramesContainer.idl2
-rw-r--r--offapi/com/sun/star/frame/GlobalEventBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/frame/IllegalArgumentIOException.idl2
-rw-r--r--offapi/com/sun/star/frame/LayoutManager.idl20
-rw-r--r--offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl2
-rw-r--r--offapi/com/sun/star/frame/ModuleManager.idl5
-rw-r--r--offapi/com/sun/star/frame/PopupMenuController.idl15
-rw-r--r--offapi/com/sun/star/frame/PopupMenuControllerFactory.idl5
-rw-r--r--offapi/com/sun/star/frame/ProtocolHandler.idl5
-rw-r--r--offapi/com/sun/star/frame/SessionManager.idl2
-rw-r--r--offapi/com/sun/star/frame/Settings.idl2
-rw-r--r--offapi/com/sun/star/frame/StatusbarController.idl11
-rw-r--r--offapi/com/sun/star/frame/StatusbarControllerFactory.idl5
-rw-r--r--offapi/com/sun/star/frame/SynchronousFrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/Task.idl5
-rw-r--r--offapi/com/sun/star/frame/TemplateAccess.idl5
-rw-r--r--offapi/com/sun/star/frame/TerminationVetoException.idl2
-rw-r--r--offapi/com/sun/star/frame/TitleChangedEvent.idl2
-rw-r--r--offapi/com/sun/star/frame/ToolbarController.idl14
-rw-r--r--offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl2
-rw-r--r--offapi/com/sun/star/frame/UnknownModuleException.idl2
-rw-r--r--offapi/com/sun/star/frame/XBorderResizeListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl5
-rw-r--r--offapi/com/sun/star/frame/XComponentLoader.idl14
-rw-r--r--offapi/com/sun/star/frame/XComponentRegistry.idl5
-rw-r--r--offapi/com/sun/star/frame/XConfigManager.idl5
-rw-r--r--offapi/com/sun/star/frame/XControlNotificationListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XController.idl2
-rw-r--r--offapi/com/sun/star/frame/XControllerBorder.idl8
-rw-r--r--offapi/com/sun/star/frame/XDesktop.idl14
-rw-r--r--offapi/com/sun/star/frame/XDesktopTask.idl5
-rw-r--r--offapi/com/sun/star/frame/XDispatch.idl11
-rw-r--r--offapi/com/sun/star/frame/XDispatchHelper.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchInformationProvider.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchProvider.idl11
-rw-r--r--offapi/com/sun/star/frame/XDispatchProviderInterception.idl5
-rw-r--r--offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl2
-rw-r--r--offapi/com/sun/star/frame/XDispatchRecorder.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchResultListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XDocumentTemplates.idl5
-rw-r--r--offapi/com/sun/star/frame/XExtendedFilterDetection.idl5
-rw-r--r--offapi/com/sun/star/frame/XFilterDetect.idl2
-rw-r--r--offapi/com/sun/star/frame/XFrame.idl5
-rw-r--r--offapi/com/sun/star/frame/XFrameActionListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XFrameLoader.idl11
-rw-r--r--offapi/com/sun/star/frame/XFrameLoaderQuery.idl8
-rw-r--r--offapi/com/sun/star/frame/XFrameSetModel.idl2
-rw-r--r--offapi/com/sun/star/frame/XFrames.idl5
-rw-r--r--offapi/com/sun/star/frame/XFramesSupplier.idl2
-rw-r--r--offapi/com/sun/star/frame/XInplaceLayout.idl2
-rw-r--r--offapi/com/sun/star/frame/XInterceptorInfo.idl2
-rw-r--r--offapi/com/sun/star/frame/XLayoutManager.idl23
-rw-r--r--offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/frame/XLayoutManagerListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XLoadEventListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XLoadable.idl11
-rw-r--r--offapi/com/sun/star/frame/XMenuBarAcceptor.idl5
-rw-r--r--offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl5
-rw-r--r--offapi/com/sun/star/frame/XModel.idl14
-rw-r--r--offapi/com/sun/star/frame/XModule.idl8
-rw-r--r--offapi/com/sun/star/frame/XModuleManager.idl8
-rw-r--r--offapi/com/sun/star/frame/XNotifyingDispatch.idl5
-rw-r--r--offapi/com/sun/star/frame/XPopupMenuController.idl2
-rw-r--r--offapi/com/sun/star/frame/XRecordableDispatch.idl8
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerClient.idl2
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerListener2.idl5
-rw-r--r--offapi/com/sun/star/frame/XStatusListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XStatusbarController.idl11
-rw-r--r--offapi/com/sun/star/frame/XStorable.idl8
-rw-r--r--offapi/com/sun/star/frame/XStorable2.idl11
-rw-r--r--offapi/com/sun/star/frame/XSubToolbarController.idl2
-rw-r--r--offapi/com/sun/star/frame/XSynchronousDispatch.idl8
-rw-r--r--offapi/com/sun/star/frame/XSynchronousFrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/XTask.idl2
-rw-r--r--offapi/com/sun/star/frame/XTasksSupplier.idl8
-rw-r--r--offapi/com/sun/star/frame/XTerminateListener.idl8
-rw-r--r--offapi/com/sun/star/frame/XTerminateListener2.idl2
-rw-r--r--offapi/com/sun/star/frame/XTitle.idl5
-rw-r--r--offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/frame/XTitleChangeListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XToolbarController.idl5
-rw-r--r--offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl11
-rw-r--r--offapi/com/sun/star/frame/XUIControllerRegistration.idl2
-rw-r--r--offapi/com/sun/star/frame/XUntitledNumbers.idl5
-rw-r--r--offapi/com/sun/star/frame/XUrlList.idl2
-rw-r--r--offapi/com/sun/star/frame/XWindowArranger.idl2
-rw-r--r--offapi/com/sun/star/gallery/GalleryItem.idl8
-rw-r--r--offapi/com/sun/star/gallery/GalleryTheme.idl2
-rw-r--r--offapi/com/sun/star/gallery/GalleryThemeProvider.idl4
-rw-r--r--offapi/com/sun/star/gallery/XGalleryItem.idl2
-rw-r--r--offapi/com/sun/star/gallery/XGalleryTheme.idl12
-rw-r--r--offapi/com/sun/star/gallery/XGalleryThemeProvider.idl8
-rw-r--r--offapi/com/sun/star/geometry/EllipticalArc.idl2
-rw-r--r--offapi/com/sun/star/geometry/XMapping2D.idl4
-rw-r--r--offapi/com/sun/star/graphic/XPrimitive2D.idl6
-rw-r--r--offapi/com/sun/star/graphic/XPrimitive3D.idl6
-rw-r--r--offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl4
-rw-r--r--offapi/com/sun/star/i18n/BreakIterator.idl3
-rw-r--r--offapi/com/sun/star/i18n/CharacterClassification.idl1
-rw-r--r--offapi/com/sun/star/i18n/Collator.idl3
-rw-r--r--offapi/com/sun/star/i18n/Currency2.idl2
-rw-r--r--offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl2
-rw-r--r--offapi/com/sun/star/i18n/LineBreakResults.idl2
-rw-r--r--offapi/com/sun/star/i18n/MultipleCharsOutputException.idl2
-rw-r--r--offapi/com/sun/star/i18n/TextConversion.idl2
-rw-r--r--offapi/com/sun/star/i18n/TextConversionResult.idl2
-rw-r--r--offapi/com/sun/star/i18n/XBreakIterator.idl14
-rw-r--r--offapi/com/sun/star/i18n/XCharacterClassification.idl5
-rw-r--r--offapi/com/sun/star/i18n/XForbiddenCharacters.idl5
-rw-r--r--offapi/com/sun/star/i18n/XIndexEntrySupplier.idl2
-rw-r--r--offapi/com/sun/star/i18n/XNumberFormatCode.idl2
-rw-r--r--offapi/com/sun/star/i18n/XTextConversion.idl14
-rw-r--r--offapi/com/sun/star/image/ImageMap.idl5
-rw-r--r--offapi/com/sun/star/image/ImageMapCircleObject.idl4
-rw-r--r--offapi/com/sun/star/image/ImageMapObject.idl4
-rw-r--r--offapi/com/sun/star/image/ImageMapPolygonObject.idl4
-rw-r--r--offapi/com/sun/star/image/ImageMapRectangleObject.idl4
-rw-r--r--offapi/com/sun/star/inspection/DefaultHelpProvider.idl2
-rw-r--r--offapi/com/sun/star/inspection/GenericPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/inspection/LineDescriptor.idl2
-rw-r--r--offapi/com/sun/star/inspection/ObjectInspector.idl5
-rw-r--r--offapi/com/sun/star/inspection/ObjectInspectorModel.idl5
-rw-r--r--offapi/com/sun/star/inspection/XHyperlinkControl.idl4
-rw-r--r--offapi/com/sun/star/inspection/XNumericControl.idl6
-rw-r--r--offapi/com/sun/star/inspection/XObjectInspector.idl6
-rw-r--r--offapi/com/sun/star/inspection/XObjectInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/inspection/XObjectInspectorUI.idl8
-rw-r--r--offapi/com/sun/star/inspection/XPropertyControl.idl4
-rw-r--r--offapi/com/sun/star/inspection/XPropertyControlContext.idl2
-rw-r--r--offapi/com/sun/star/inspection/XPropertyControlFactory.idl2
-rw-r--r--offapi/com/sun/star/inspection/XPropertyControlObserver.idl2
-rw-r--r--offapi/com/sun/star/inspection/XPropertyHandler.idl16
-rw-r--r--offapi/com/sun/star/inspection/XStringListControl.idl2
-rw-r--r--offapi/com/sun/star/inspection/XStringRepresentation.idl2
-rw-r--r--offapi/com/sun/star/installation/InstallationCheck.idl2
-rw-r--r--offapi/com/sun/star/installation/InstallationCheckService.idl2
-rw-r--r--offapi/com/sun/star/installation/InternetSettings.idl2
-rw-r--r--offapi/com/sun/star/installation/ProtocolHandlerCheck.idl2
-rw-r--r--offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl2
-rw-r--r--offapi/com/sun/star/installation/XInstallationCheck.idl2
-rw-r--r--offapi/com/sun/star/installation/XProtocolHandlerCheck.idl4
-rw-r--r--offapi/com/sun/star/ldap/LdapConnectionException.idl2
-rw-r--r--offapi/com/sun/star/ldap/LdapGenericException.idl2
-rw-r--r--offapi/com/sun/star/linguistic2/ConversionDictionary.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/Dictionary.idl11
-rw-r--r--offapi/com/sun/star/linguistic2/DictionaryEvent.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/DictionaryList.idl4
-rw-r--r--offapi/com/sun/star/linguistic2/DictionaryListEvent.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/Hyphenator.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/LinguProperties.idl10
-rw-r--r--offapi/com/sun/star/linguistic2/LinguServiceEvent.idl2
-rw-r--r--offapi/com/sun/star/linguistic2/LinguServiceManager.idl4
-rw-r--r--offapi/com/sun/star/linguistic2/ProofreadingResult.idl13
-rw-r--r--offapi/com/sun/star/linguistic2/SingleProofreadingError.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/SpellChecker.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/Thesaurus.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/XAvailableLocales.idl2
-rw-r--r--offapi/com/sun/star/linguistic2/XConversionDictionary.idl20
-rw-r--r--offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl17
-rw-r--r--offapi/com/sun/star/linguistic2/XConversionPropertyType.idl7
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionary.idl14
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionary1.idl11
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionaryEntry.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionaryList.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XHyphenatedWord.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XHyphenator.idl21
-rw-r--r--offapi/com/sun/star/linguistic2/XLanguageGuessing.idl6
-rw-r--r--offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XLinguServiceManager.idl11
-rw-r--r--offapi/com/sun/star/linguistic2/XMeaning.idl2
-rw-r--r--offapi/com/sun/star/linguistic2/XPossibleHyphens.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XProofreader.idl20
-rw-r--r--offapi/com/sun/star/linguistic2/XProofreadingIterator.idl17
-rw-r--r--offapi/com/sun/star/linguistic2/XSearchableDictionary.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl2
-rw-r--r--offapi/com/sun/star/linguistic2/XSpellAlternatives.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XSpellChecker.idl15
-rw-r--r--offapi/com/sun/star/linguistic2/XSpellChecker1.idl15
-rw-r--r--offapi/com/sun/star/linguistic2/XSupportedLanguages.idl5
-rw-r--r--offapi/com/sun/star/linguistic2/XSupportedLocales.idl8
-rw-r--r--offapi/com/sun/star/linguistic2/XThesaurus.idl11
-rw-r--r--offapi/com/sun/star/logging/ConsoleHandler.idl4
-rw-r--r--offapi/com/sun/star/logging/DocumentIOLogRing.idl4
-rw-r--r--offapi/com/sun/star/logging/FileHandler.idl4
-rw-r--r--offapi/com/sun/star/logging/LogRecord.idl2
-rw-r--r--offapi/com/sun/star/logging/LoggerPool.idl2
-rw-r--r--offapi/com/sun/star/logging/SimpleLogRing.idl4
-rw-r--r--offapi/com/sun/star/logging/XConsoleHandler.idl2
-rw-r--r--offapi/com/sun/star/logging/XCsvLogFormatter.idl5
-rw-r--r--offapi/com/sun/star/logging/XLogFormatter.idl5
-rw-r--r--offapi/com/sun/star/logging/XLogHandler.idl8
-rw-r--r--offapi/com/sun/star/logging/XLogger.idl2
-rw-r--r--offapi/com/sun/star/logging/XLoggerPool.idl2
-rw-r--r--offapi/com/sun/star/logging/XSimpleLogRing.idl2
-rw-r--r--offapi/com/sun/star/mail/MailAttachment.idl2
-rw-r--r--offapi/com/sun/star/mail/MailException.idl2
-rw-r--r--offapi/com/sun/star/mail/MailMessage.idl8
-rw-r--r--offapi/com/sun/star/mail/MailServer.idl2
-rw-r--r--offapi/com/sun/star/mail/MailServiceProvider.idl8
-rw-r--r--offapi/com/sun/star/mail/NoMailServiceProviderException.idl2
-rw-r--r--offapi/com/sun/star/mail/NoMailTransportProviderException.idl2
-rw-r--r--offapi/com/sun/star/mail/SendMailMessageFailedException.idl2
-rw-r--r--offapi/com/sun/star/mail/XAuthenticator.idl2
-rw-r--r--offapi/com/sun/star/mail/XConnectionListener.idl5
-rw-r--r--offapi/com/sun/star/mail/XMailMessage.idl8
-rw-r--r--offapi/com/sun/star/mail/XMailServer.idl44
-rw-r--r--offapi/com/sun/star/mail/XMailService.idl35
-rw-r--r--offapi/com/sun/star/mail/XMailServiceProvider.idl8
-rw-r--r--offapi/com/sun/star/mail/XSmtpService.idl20
-rw-r--r--offapi/com/sun/star/media/Manager.idl2
-rw-r--r--offapi/com/sun/star/media/XFrameGrabber.idl2
-rw-r--r--offapi/com/sun/star/media/XManager.idl4
-rw-r--r--offapi/com/sun/star/media/XPlayer.idl6
-rw-r--r--offapi/com/sun/star/media/XPlayerWindow.idl4
-rw-r--r--offapi/com/sun/star/mozilla/MenuMultipleChange.idl2
-rw-r--r--offapi/com/sun/star/mozilla/MenuProxy.idl2
-rw-r--r--offapi/com/sun/star/mozilla/MenuProxyListener.idl2
-rw-r--r--offapi/com/sun/star/mozilla/MenuSingleChange.idl2
-rw-r--r--offapi/com/sun/star/mozilla/MozillaBootstrap.idl2
-rw-r--r--offapi/com/sun/star/mozilla/XCloseSessionListener.idl2
-rw-r--r--offapi/com/sun/star/mozilla/XCodeProxy.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XMenuProxy.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XMenuProxyListener.idl6
-rw-r--r--offapi/com/sun/star/mozilla/XMozillaBootstrap.idl9
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstance.idl5
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl2
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstancePeer.idl8
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl5
-rw-r--r--offapi/com/sun/star/mozilla/XPluginWindowPeer.idl2
-rw-r--r--offapi/com/sun/star/mozilla/XProfileDiscover.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XProfileManager.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XProxyRunner.idl5
-rw-r--r--offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl2
-rw-r--r--offapi/com/sun/star/office/XAnnotation.idl20
-rw-r--r--offapi/com/sun/star/office/XAnnotationAccess.idl10
-rw-r--r--offapi/com/sun/star/office/XAnnotationEnumeration.idl4
-rw-r--r--offapi/com/sun/star/packages/EncryptionNotAllowedException.idl2
-rw-r--r--offapi/com/sun/star/packages/NoEncryptionException.idl2
-rw-r--r--offapi/com/sun/star/packages/NoRawFormatException.idl2
-rw-r--r--offapi/com/sun/star/packages/Package.idl11
-rw-r--r--offapi/com/sun/star/packages/PackageFolder.idl14
-rw-r--r--offapi/com/sun/star/packages/PackageFolderEnumeration.idl2
-rw-r--r--offapi/com/sun/star/packages/PackageStream.idl11
-rw-r--r--offapi/com/sun/star/packages/WrongPasswordException.idl2
-rw-r--r--offapi/com/sun/star/packages/XDataSinkEncrSupport.idl17
-rw-r--r--offapi/com/sun/star/packages/manifest/XManifestReader.idl5
-rw-r--r--offapi/com/sun/star/packages/manifest/XManifestWriter.idl5
-rw-r--r--offapi/com/sun/star/packages/zip/XZipFileAccess.idl11
-rw-r--r--offapi/com/sun/star/packages/zip/ZipEntry.idl6
-rw-r--r--offapi/com/sun/star/packages/zip/ZipException.idl6
-rw-r--r--offapi/com/sun/star/packages/zip/ZipFileAccess.idl14
-rw-r--r--offapi/com/sun/star/packages/zip/ZipIOException.idl2
-rw-r--r--offapi/com/sun/star/plugin/PluginException.idl2
-rw-r--r--offapi/com/sun/star/plugin/PluginManager.idl2
-rw-r--r--offapi/com/sun/star/plugin/XPlugin.idl6
-rw-r--r--offapi/com/sun/star/plugin/XPluginContext.idl12
-rw-r--r--offapi/com/sun/star/plugin/XPluginManager.idl14
-rw-r--r--offapi/com/sun/star/presentation/ChartShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/CustomPresentation.idl4
-rw-r--r--offapi/com/sun/star/presentation/CustomPresentationAccess.idl4
-rw-r--r--offapi/com/sun/star/presentation/DateTimeShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/DocumentSettings.idl5
-rw-r--r--offapi/com/sun/star/presentation/DrawPage.idl8
-rw-r--r--offapi/com/sun/star/presentation/FooterShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/GraphicObjectShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/HandoutShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/HandoutView.idl2
-rw-r--r--offapi/com/sun/star/presentation/HeaderShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/NotesShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/NotesView.idl2
-rw-r--r--offapi/com/sun/star/presentation/OLE2Shape.idl4
-rw-r--r--offapi/com/sun/star/presentation/OutlineView.idl13
-rw-r--r--offapi/com/sun/star/presentation/OutlinerShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/PageShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/ParagraphTarget.idl2
-rw-r--r--offapi/com/sun/star/presentation/Presentation.idl4
-rw-r--r--offapi/com/sun/star/presentation/Presentation2.idl5
-rw-r--r--offapi/com/sun/star/presentation/PresentationDocument.idl11
-rw-r--r--offapi/com/sun/star/presentation/PresentationView.idl14
-rw-r--r--offapi/com/sun/star/presentation/PreviewView.idl13
-rw-r--r--offapi/com/sun/star/presentation/Shape.idl9
-rw-r--r--offapi/com/sun/star/presentation/SlideNumberShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/SlidesView.idl13
-rw-r--r--offapi/com/sun/star/presentation/SubtitleShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/TitleTextShape.idl4
-rw-r--r--offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl4
-rw-r--r--offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl4
-rw-r--r--offapi/com/sun/star/presentation/XPresentation.idl2
-rw-r--r--offapi/com/sun/star/presentation/XPresentation2.idl14
-rw-r--r--offapi/com/sun/star/presentation/XPresentationPage.idl2
-rw-r--r--offapi/com/sun/star/presentation/XPresentationSupplier.idl4
-rw-r--r--offapi/com/sun/star/presentation/XShapeEventListener.idl6
-rw-r--r--offapi/com/sun/star/presentation/XSlideShow.idl24
-rw-r--r--offapi/com/sun/star/presentation/XSlideShowController.idl11
-rw-r--r--offapi/com/sun/star/presentation/XSlideShowListener.idl2
-rw-r--r--offapi/com/sun/star/presentation/XSlideShowView.idl14
-rw-r--r--offapi/com/sun/star/presentation/XTransition.idl2
-rw-r--r--offapi/com/sun/star/presentation/XTransitionFactory.idl4
-rw-r--r--offapi/com/sun/star/rdf/BlankNode.idl5
-rw-r--r--offapi/com/sun/star/rdf/Literal.idl5
-rw-r--r--offapi/com/sun/star/rdf/ParseException.idl3
-rw-r--r--offapi/com/sun/star/rdf/QueryException.idl3
-rw-r--r--offapi/com/sun/star/rdf/Repository.idl2
-rw-r--r--offapi/com/sun/star/rdf/RepositoryException.idl3
-rw-r--r--offapi/com/sun/star/rdf/Statement.idl2
-rw-r--r--offapi/com/sun/star/rdf/URI.idl5
-rw-r--r--offapi/com/sun/star/rdf/XBlankNode.idl2
-rw-r--r--offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl44
-rw-r--r--offapi/com/sun/star/rdf/XDocumentRepository.idl8
-rw-r--r--offapi/com/sun/star/rdf/XLiteral.idl2
-rw-r--r--offapi/com/sun/star/rdf/XMetadatable.idl8
-rw-r--r--offapi/com/sun/star/rdf/XNamedGraph.idl14
-rw-r--r--offapi/com/sun/star/rdf/XNode.idl2
-rw-r--r--offapi/com/sun/star/rdf/XQuerySelectResult.idl2
-rw-r--r--offapi/com/sun/star/rdf/XReifiedStatement.idl2
-rw-r--r--offapi/com/sun/star/rdf/XRepository.idl50
-rw-r--r--offapi/com/sun/star/rdf/XRepositorySupplier.idl2
-rw-r--r--offapi/com/sun/star/rdf/XResource.idl2
-rw-r--r--offapi/com/sun/star/rdf/XURI.idl2
-rw-r--r--offapi/com/sun/star/rendering/AnimationAttributes.idl2
-rw-r--r--offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl4
-rw-r--r--offapi/com/sun/star/rendering/FontInfo.idl5
-rw-r--r--offapi/com/sun/star/rendering/FontRequest.idl5
-rw-r--r--offapi/com/sun/star/rendering/IntegerBitmapLayout.idl4
-rw-r--r--offapi/com/sun/star/rendering/MtfRenderer.idl2
-rw-r--r--offapi/com/sun/star/rendering/RenderState.idl4
-rw-r--r--offapi/com/sun/star/rendering/StrokeAttributes.idl4
-rw-r--r--offapi/com/sun/star/rendering/Texture.idl4
-rw-r--r--offapi/com/sun/star/rendering/ViewState.idl2
-rw-r--r--offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl2
-rw-r--r--offapi/com/sun/star/rendering/XAnimatedSprite.idl12
-rw-r--r--offapi/com/sun/star/rendering/XAnimation.idl10
-rw-r--r--offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl8
-rw-r--r--offapi/com/sun/star/rendering/XBitmap.idl10
-rw-r--r--offapi/com/sun/star/rendering/XBitmapCanvas.idl14
-rw-r--r--offapi/com/sun/star/rendering/XBitmapPalette.idl8
-rw-r--r--offapi/com/sun/star/rendering/XBufferController.idl4
-rw-r--r--offapi/com/sun/star/rendering/XCachedPrimitive.idl6
-rw-r--r--offapi/com/sun/star/rendering/XCanvas.idl31
-rw-r--r--offapi/com/sun/star/rendering/XCanvasFont.idl19
-rw-r--r--offapi/com/sun/star/rendering/XColorSpace.idl8
-rw-r--r--offapi/com/sun/star/rendering/XCustomSprite.idl8
-rw-r--r--offapi/com/sun/star/rendering/XGraphicDevice.idl16
-rw-r--r--offapi/com/sun/star/rendering/XHalfFloatBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XIntegerBitmap.idl12
-rw-r--r--offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl2
-rw-r--r--offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl14
-rw-r--r--offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl8
-rw-r--r--offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl10
-rw-r--r--offapi/com/sun/star/rendering/XPolyPolygon2D.idl10
-rw-r--r--offapi/com/sun/star/rendering/XSimpleCanvas.idl16
-rw-r--r--offapi/com/sun/star/rendering/XSprite.idl12
-rw-r--r--offapi/com/sun/star/rendering/XSpriteCanvas.idl8
-rw-r--r--offapi/com/sun/star/rendering/XTextLayout.idl22
-rw-r--r--offapi/com/sun/star/rendering/XVolatileBitmap.idl2
-rw-r--r--offapi/com/sun/star/report/XFixedLine.idl11
-rw-r--r--offapi/com/sun/star/report/XFixedText.idl2
-rw-r--r--offapi/com/sun/star/report/XFormatCondition.idl2
-rw-r--r--offapi/com/sun/star/report/XFormattedField.idl4
-rw-r--r--offapi/com/sun/star/report/XFunction.idl8
-rw-r--r--offapi/com/sun/star/report/XFunctions.idl8
-rw-r--r--offapi/com/sun/star/report/XFunctionsSupplier.idl4
-rw-r--r--offapi/com/sun/star/report/XGroup.idl6
-rw-r--r--offapi/com/sun/star/report/XGroups.idl8
-rw-r--r--offapi/com/sun/star/report/XImageControl.idl4
-rw-r--r--offapi/com/sun/star/report/XReportComponent.idl14
-rw-r--r--offapi/com/sun/star/report/XReportControlModel.idl10
-rw-r--r--offapi/com/sun/star/report/XReportDefinition.idl38
-rw-r--r--offapi/com/sun/star/report/XReportEngine.idl22
-rw-r--r--offapi/com/sun/star/report/XSection.idl16
-rw-r--r--offapi/com/sun/star/report/XShape.idl8
-rw-r--r--offapi/com/sun/star/report/inspection/DataProviderHandler.idl2
-rw-r--r--offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/report/inspection/ReportComponentHandler.idl2
-rw-r--r--offapi/com/sun/star/resource/MissingResourceException.idl2
-rw-r--r--offapi/com/sun/star/resource/OfficeResourceLoader.idl2
-rw-r--r--offapi/com/sun/star/resource/StringResource.idl2
-rw-r--r--offapi/com/sun/star/resource/StringResourceWithLocation.idl2
-rw-r--r--offapi/com/sun/star/resource/StringResourceWithStorage.idl2
-rw-r--r--offapi/com/sun/star/resource/XLocale.idl6
-rw-r--r--offapi/com/sun/star/resource/XResourceBundle.idl5
-rw-r--r--offapi/com/sun/star/resource/XResourceBundleLoader.idl8
-rw-r--r--offapi/com/sun/star/resource/XStringResourceManager.idl17
-rw-r--r--offapi/com/sun/star/resource/XStringResourcePersistence.idl8
-rw-r--r--offapi/com/sun/star/resource/XStringResourceResolver.idl8
-rw-r--r--offapi/com/sun/star/resource/XStringResourceSupplier.idl2
-rw-r--r--offapi/com/sun/star/resource/XStringResourceWithLocation.idl2
-rw-r--r--offapi/com/sun/star/resource/XStringResourceWithStorage.idl2
-rw-r--r--offapi/com/sun/star/scanner/ScannerException.idl5
-rw-r--r--offapi/com/sun/star/scanner/ScannerManager.idl2
-rw-r--r--offapi/com/sun/star/scanner/XScannerManager.idl17
-rw-r--r--offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl6
-rw-r--r--offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl6
-rw-r--r--offapi/com/sun/star/script/LibraryNotLoadedException.idl2
-rw-r--r--offapi/com/sun/star/script/ModuleInfo.idl2
-rw-r--r--offapi/com/sun/star/script/ModuleSizeExceededRequest.idl2
-rw-r--r--offapi/com/sun/star/script/XLibraryContainer.idl16
-rw-r--r--offapi/com/sun/star/script/XLibraryContainer2.idl2
-rw-r--r--offapi/com/sun/star/script/XLibraryContainer3.idl2
-rw-r--r--offapi/com/sun/star/script/XLibraryContainerExport.idl7
-rw-r--r--offapi/com/sun/star/script/XLibraryContainerPassword.idl6
-rw-r--r--offapi/com/sun/star/script/XLibraryQueryExecutable.idl2
-rw-r--r--offapi/com/sun/star/script/XPersistentLibraryContainer.idl6
-rw-r--r--offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl4
-rw-r--r--offapi/com/sun/star/script/browse/BrowseNode.idl4
-rw-r--r--offapi/com/sun/star/script/browse/BrowseNodeFactory.idl2
-rw-r--r--offapi/com/sun/star/script/browse/XBrowseNode.idl2
-rw-r--r--offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl6
-rw-r--r--offapi/com/sun/star/script/provider/LanguageScriptProvider.idl5
-rw-r--r--offapi/com/sun/star/script/provider/MasterScriptProvider.idl5
-rw-r--r--offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl2
-rw-r--r--offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl2
-rw-r--r--offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl2
-rw-r--r--offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl2
-rw-r--r--offapi/com/sun/star/script/provider/ScriptProvider.idl8
-rw-r--r--offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl5
-rw-r--r--offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl5
-rw-r--r--offapi/com/sun/star/script/provider/ScriptProviderForJava.idl5
-rw-r--r--offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl5
-rw-r--r--offapi/com/sun/star/script/provider/ScriptURIHelper.idl4
-rw-r--r--offapi/com/sun/star/script/provider/XScript.idl14
-rw-r--r--offapi/com/sun/star/script/provider/XScriptContext.idl11
-rw-r--r--offapi/com/sun/star/script/provider/XScriptProvider.idl8
-rw-r--r--offapi/com/sun/star/script/provider/XScriptProviderFactory.idl6
-rw-r--r--offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl6
-rw-r--r--offapi/com/sun/star/script/provider/XScriptURIHelper.idl5
-rw-r--r--offapi/com/sun/star/sdb/CallableStatement.idl4
-rw-r--r--offapi/com/sun/star/sdb/Column.idl4
-rw-r--r--offapi/com/sun/star/sdb/ColumnDescriptorControl.idl2
-rw-r--r--offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl2
-rw-r--r--offapi/com/sun/star/sdb/ColumnSettings.idl2
-rw-r--r--offapi/com/sun/star/sdb/Connection.idl6
-rw-r--r--offapi/com/sun/star/sdb/ContentLoader.idl2
-rw-r--r--offapi/com/sun/star/sdb/DataAccessDescriptor.idl11
-rw-r--r--offapi/com/sun/star/sdb/DataColumn.idl2
-rw-r--r--offapi/com/sun/star/sdb/DataSettings.idl7
-rw-r--r--offapi/com/sun/star/sdb/DataSource.idl10
-rw-r--r--offapi/com/sun/star/sdb/DataSourceBrowser.idl10
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccess.idl6
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessConnection.idl6
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessContext.idl8
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl11
-rw-r--r--offapi/com/sun/star/sdb/DatabaseContext.idl10
-rw-r--r--offapi/com/sun/star/sdb/DatabaseDocument.idl4
-rw-r--r--offapi/com/sun/star/sdb/DatabaseEnvironment.idl4
-rw-r--r--offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl11
-rw-r--r--offapi/com/sun/star/sdb/Document.idl2
-rw-r--r--offapi/com/sun/star/sdb/DocumentContainer.idl4
-rw-r--r--offapi/com/sun/star/sdb/DocumentDataSource.idl6
-rw-r--r--offapi/com/sun/star/sdb/DocumentDefinition.idl4
-rw-r--r--offapi/com/sun/star/sdb/DocumentSaveRequest.idl4
-rw-r--r--offapi/com/sun/star/sdb/ErrorMessageDialog.idl11
-rw-r--r--offapi/com/sun/star/sdb/Forms.idl2
-rw-r--r--offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl12
-rw-r--r--offapi/com/sun/star/sdb/OrderColumn.idl2
-rw-r--r--offapi/com/sun/star/sdb/ParametersRequest.idl6
-rw-r--r--offapi/com/sun/star/sdb/PreparedStatement.idl2
-rw-r--r--offapi/com/sun/star/sdb/Query.idl6
-rw-r--r--offapi/com/sun/star/sdb/QueryDefinition.idl2
-rw-r--r--offapi/com/sun/star/sdb/QueryDescriptor.idl4
-rw-r--r--offapi/com/sun/star/sdb/QueryDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/RelationDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/Reports.idl2
-rw-r--r--offapi/com/sun/star/sdb/ResultColumn.idl4
-rw-r--r--offapi/com/sun/star/sdb/ResultSet.idl2
-rw-r--r--offapi/com/sun/star/sdb/RowChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/sdb/RowSet.idl8
-rw-r--r--offapi/com/sun/star/sdb/RowSetVetoException.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLContext.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLQueryComposer.idl2
-rw-r--r--offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl2
-rw-r--r--offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl4
-rw-r--r--offapi/com/sun/star/sdb/Table.idl4
-rw-r--r--offapi/com/sun/star/sdb/TableDescriptor.idl4
-rw-r--r--offapi/com/sun/star/sdb/TableDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/XAlterQuery.idl4
-rw-r--r--offapi/com/sun/star/sdb/XBookmarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XColumn.idl10
-rw-r--r--offapi/com/sun/star/sdb/XColumnUpdate.idl10
-rw-r--r--offapi/com/sun/star/sdb/XCommandPreparation.idl2
-rw-r--r--offapi/com/sun/star/sdb/XCompletedConnection.idl4
-rw-r--r--offapi/com/sun/star/sdb/XCompletedExecution.idl4
-rw-r--r--offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl2
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseAccess.idl6
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseAccessListener.idl2
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseEnvironment.idl8
-rw-r--r--offapi/com/sun/star/sdb/XDocumentDataSource.idl2
-rw-r--r--offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XInteractionDocumentSave.idl4
-rw-r--r--offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl4
-rw-r--r--offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl8
-rw-r--r--offapi/com/sun/star/sdb/XParametersSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XQueriesSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XResultSetAccess.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/sdb/XRowSetApproveListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowSetSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowsChangeListener.idl2
-rw-r--r--offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/sdb/XSQLErrorListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/XSQLQueryComposer.idl6
-rw-r--r--offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl2
-rw-r--r--offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl8
-rw-r--r--offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl8
-rw-r--r--offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/CopyTableWizard.idl12
-rw-r--r--offapi/com/sun/star/sdb/application/DatabaseObject.idl2
-rw-r--r--offapi/com/sun/star/sdb/application/XCopyTableListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/XCopyTableWizard.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/tools/XConnectionTools.idl4
-rw-r--r--offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl2
-rw-r--r--offapi/com/sun/star/sdb/tools/XIndexAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XKeyAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XObjectNames.idl5
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableName.idl8
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableRename.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XViewAccess.idl6
-rw-r--r--offapi/com/sun/star/sdbc/BatchUpdateException.idl2
-rw-r--r--offapi/com/sun/star/sdbc/CallableStatement.idl2
-rw-r--r--offapi/com/sun/star/sdbc/ChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/sdbc/Connection.idl2
-rw-r--r--offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl2
-rw-r--r--offapi/com/sun/star/sdbc/DataTruncation.idl2
-rw-r--r--offapi/com/sun/star/sdbc/DriverManager.idl2
-rw-r--r--offapi/com/sun/star/sdbc/FILEConnectionProperties.idl2
-rw-r--r--offapi/com/sun/star/sdbc/FLATConnectionProperties.idl2
-rw-r--r--offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl4
-rw-r--r--offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl2
-rw-r--r--offapi/com/sun/star/sdbc/PreparedStatement.idl6
-rw-r--r--offapi/com/sun/star/sdbc/ResultSet.idl6
-rw-r--r--offapi/com/sun/star/sdbc/RowSet.idl4
-rw-r--r--offapi/com/sun/star/sdbc/SQLException.idl2
-rw-r--r--offapi/com/sun/star/sdbc/SQLWarning.idl2
-rw-r--r--offapi/com/sun/star/sdbc/Statement.idl6
-rw-r--r--offapi/com/sun/star/sdbc/XArray.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XBatchExecution.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XBlob.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XClob.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XCloseable.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XColumnLocate.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XConnection.idl6
-rw-r--r--offapi/com/sun/star/sdbc/XDataSource.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XDatabaseMetaData.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XDriver.idl8
-rw-r--r--offapi/com/sun/star/sdbc/XDriverAccess.idl2
-rw-r--r--offapi/com/sun/star/sdbc/XDriverManager.idl6
-rw-r--r--offapi/com/sun/star/sdbc/XGeneratedResultSet.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XIsolatedConnection.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XMultipleResults.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XOutParameters.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XParameters.idl10
-rw-r--r--offapi/com/sun/star/sdbc/XPooledConnection.idl6
-rw-r--r--offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XPreparedStatement.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XRef.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XResultSet.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XResultSetMetaData.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XResultSetUpdate.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XRow.idl10
-rw-r--r--offapi/com/sun/star/sdbc/XRowSet.idl2
-rw-r--r--offapi/com/sun/star/sdbc/XRowSetListener.idl2
-rw-r--r--offapi/com/sun/star/sdbc/XRowUpdate.idl10
-rw-r--r--offapi/com/sun/star/sdbc/XSQLData.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XSQLInput.idl10
-rw-r--r--offapi/com/sun/star/sdbc/XSQLOutput.idl10
-rw-r--r--offapi/com/sun/star/sdbc/XStatement.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XStruct.idl4
-rw-r--r--offapi/com/sun/star/sdbc/XWarningsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/Column.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/ColumnDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Descriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Driver.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Group.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/GroupDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Index.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/IndexColumn.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/IndexDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Key.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/KeyColumn.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/KeyDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/PreparedStatement.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/ReferenceColumn.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/ResultSet.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Statement.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/Table.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/TableDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/User.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/UserDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/View.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/ViewDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/XAlterTable.idl11
-rw-r--r--offapi/com/sun/star/sdbcx/XAlterView.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/XAppend.idl6
-rw-r--r--offapi/com/sun/star/sdbcx/XAuthorizable.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XColumnsSupplier.idl6
-rw-r--r--offapi/com/sun/star/sdbcx/XCreateCatalog.idl8
-rw-r--r--offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl6
-rw-r--r--offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/XDeleteRows.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XDrop.idl8
-rw-r--r--offapi/com/sun/star/sdbcx/XDropCatalog.idl8
-rw-r--r--offapi/com/sun/star/sdbcx/XGroupsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XIndexesSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XKeysSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XRename.idl6
-rw-r--r--offapi/com/sun/star/sdbcx/XRowLocate.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XTablesSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XUser.idl2
-rw-r--r--offapi/com/sun/star/sdbcx/XUsersSupplier.idl6
-rw-r--r--offapi/com/sun/star/sdbcx/XViewsSupplier.idl4
-rw-r--r--offapi/com/sun/star/security/CertificateContainer.idl1
-rw-r--r--offapi/com/sun/star/security/CertificateException.idl2
-rw-r--r--offapi/com/sun/star/security/CryptographyException.idl2
-rw-r--r--offapi/com/sun/star/security/DocumentDigitalSignatures.idl2
-rw-r--r--offapi/com/sun/star/security/EncryptionException.idl2
-rw-r--r--offapi/com/sun/star/security/KeyException.idl2
-rw-r--r--offapi/com/sun/star/security/NoPasswordException.idl2
-rw-r--r--offapi/com/sun/star/security/SecurityInfrastructureException.idl2
-rw-r--r--offapi/com/sun/star/security/SignatureException.idl2
-rw-r--r--offapi/com/sun/star/setup/BaseAction.idl2
-rw-r--r--offapi/com/sun/star/setup/CopyFileAction.idl5
-rw-r--r--offapi/com/sun/star/setup/DeleteDirAction.idl2
-rw-r--r--offapi/com/sun/star/setup/DeleteFileAction.idl5
-rw-r--r--offapi/com/sun/star/setup/DeleteFolderAction.idl2
-rw-r--r--offapi/com/sun/star/setup/DeleteFolderItemAction.idl2
-rw-r--r--offapi/com/sun/star/setup/DownloadAction.idl2
-rw-r--r--offapi/com/sun/star/setup/FontAction.idl2
-rw-r--r--offapi/com/sun/star/setup/MakeDirAction.idl2
-rw-r--r--offapi/com/sun/star/setup/MakeFolderAction.idl2
-rw-r--r--offapi/com/sun/star/setup/MakeFolderItemAction.idl2
-rw-r--r--offapi/com/sun/star/setup/MakeShortcutAction.idl2
-rw-r--r--offapi/com/sun/star/setup/ProductRegistration.idl5
-rw-r--r--offapi/com/sun/star/setup/ProfileItemAction.idl2
-rw-r--r--offapi/com/sun/star/setup/UnzipAction.idl5
-rw-r--r--offapi/com/sun/star/setup/WindowsRegistryAction.idl2
-rw-r--r--offapi/com/sun/star/setup/XSetup.idl3
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCell.idl11
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvCell.idl8
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvRuler.idl8
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvTable.idl11
-rw-r--r--offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl8
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl14
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl11
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl8
-rw-r--r--offapi/com/sun/star/sheet/ActivationEvent.idl5
-rw-r--r--offapi/com/sun/star/sheet/AddIn.idl8
-rw-r--r--offapi/com/sun/star/sheet/CellAnnotation.idl11
-rw-r--r--offapi/com/sun/star/sheet/CellAnnotationShape.idl2
-rw-r--r--offapi/com/sun/star/sheet/CellAnnotations.idl5
-rw-r--r--offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/CellAreaLink.idl8
-rw-r--r--offapi/com/sun/star/sheet/CellAreaLinks.idl4
-rw-r--r--offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/CellFormatRanges.idl5
-rw-r--r--offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/Cells.idl2
-rw-r--r--offapi/com/sun/star/sheet/CellsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/ComplexReference.idl2
-rw-r--r--offapi/com/sun/star/sheet/ConsolidationDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sheet/DDELink.idl11
-rw-r--r--offapi/com/sun/star/sheet/DDELinkInfo.idl2
-rw-r--r--offapi/com/sun/star/sheet/DDELinks.idl8
-rw-r--r--offapi/com/sun/star/sheet/DDELinksEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotDescriptor.idl11
-rw-r--r--offapi/com/sun/star/sheet/DataPilotField.idl32
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroup.idl8
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl4
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroups.idl6
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldReference.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFields.idl6
-rw-r--r--offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotItem.idl5
-rw-r--r--offapi/com/sun/star/sheet/DataPilotItems.idl6
-rw-r--r--offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSource.idl11
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceDimension.idl20
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl5
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceLevel.idl14
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceLevels.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceMember.idl5
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceMembers.idl2
-rw-r--r--offapi/com/sun/star/sheet/DataPilotTable.idl8
-rw-r--r--offapi/com/sun/star/sheet/DataPilotTables.idl4
-rw-r--r--offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl2
-rw-r--r--offapi/com/sun/star/sheet/DatabaseRange.idl17
-rw-r--r--offapi/com/sun/star/sheet/DatabaseRanges.idl6
-rw-r--r--offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/DocumentSettings.idl8
-rw-r--r--offapi/com/sun/star/sheet/ExternalLinkInfo.idl2
-rw-r--r--offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl2
-rw-r--r--offapi/com/sun/star/sheet/FormulaParser.idl8
-rw-r--r--offapi/com/sun/star/sheet/FunctionAccess.idl5
-rw-r--r--offapi/com/sun/star/sheet/FunctionDescription.idl2
-rw-r--r--offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/FunctionDescriptions.idl7
-rw-r--r--offapi/com/sun/star/sheet/GlobalSheetSettings.idl2
-rw-r--r--offapi/com/sun/star/sheet/HeaderFooterContent.idl2
-rw-r--r--offapi/com/sun/star/sheet/LabelRange.idl2
-rw-r--r--offapi/com/sun/star/sheet/LabelRanges.idl7
-rw-r--r--offapi/com/sun/star/sheet/LabelRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/LocalizedName.idl2
-rw-r--r--offapi/com/sun/star/sheet/NamedRange.idl8
-rw-r--r--offapi/com/sun/star/sheet/NamedRanges.idl11
-rw-r--r--offapi/com/sun/star/sheet/NamedRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/NoConvergenceException.idl2
-rw-r--r--offapi/com/sun/star/sheet/RangeSelectionEvent.idl2
-rw-r--r--offapi/com/sun/star/sheet/RecentFunctions.idl2
-rw-r--r--offapi/com/sun/star/sheet/ResultEvent.idl2
-rw-r--r--offapi/com/sun/star/sheet/Scenario.idl11
-rw-r--r--offapi/com/sun/star/sheet/Scenarios.idl6
-rw-r--r--offapi/com/sun/star/sheet/ScenariosEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/Shape.idl4
-rw-r--r--offapi/com/sun/star/sheet/SheetCell.idl63
-rw-r--r--offapi/com/sun/star/sheet/SheetCellCursor.idl11
-rw-r--r--offapi/com/sun/star/sheet/SheetCellRange.idl93
-rw-r--r--offapi/com/sun/star/sheet/SheetCellRanges.idl42
-rw-r--r--offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/SheetLink.idl8
-rw-r--r--offapi/com/sun/star/sheet/SheetLinks.idl6
-rw-r--r--offapi/com/sun/star/sheet/SheetLinksEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/SheetRangesQuery.idl5
-rw-r--r--offapi/com/sun/star/sheet/SheetSortDescriptor.idl5
-rw-r--r--offapi/com/sun/star/sheet/SheetSortDescriptor2.idl5
-rw-r--r--offapi/com/sun/star/sheet/Solver.idl2
-rw-r--r--offapi/com/sun/star/sheet/SolverConstraint.idl5
-rw-r--r--offapi/com/sun/star/sheet/Spreadsheet.idl51
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetDocument.idl60
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl14
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl8
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetView.idl35
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetViewPane.idl6
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl4
-rw-r--r--offapi/com/sun/star/sheet/Spreadsheets.idl11
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/SubTotalColumn.idl2
-rw-r--r--offapi/com/sun/star/sheet/SubTotalDescriptor.idl9
-rw-r--r--offapi/com/sun/star/sheet/SubTotalField.idl2
-rw-r--r--offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/TableAutoFormat.idl11
-rw-r--r--offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/TableAutoFormatField.idl26
-rw-r--r--offapi/com/sun/star/sheet/TableAutoFormats.idl6
-rw-r--r--offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/TableCellStyle.idl17
-rw-r--r--offapi/com/sun/star/sheet/TableConditionalEntry.idl5
-rw-r--r--offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/TableConditionalFormat.idl7
-rw-r--r--offapi/com/sun/star/sheet/TablePageStyle.idl5
-rw-r--r--offapi/com/sun/star/sheet/TableValidation.idl11
-rw-r--r--offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl5
-rw-r--r--offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl2
-rw-r--r--offapi/com/sun/star/sheet/VolatileResult.idl2
-rw-r--r--offapi/com/sun/star/sheet/XActivationBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/sheet/XActivationEventListener.idl5
-rw-r--r--offapi/com/sun/star/sheet/XAddIn.idl2
-rw-r--r--offapi/com/sun/star/sheet/XAreaLink.idl5
-rw-r--r--offapi/com/sun/star/sheet/XAreaLinks.idl5
-rw-r--r--offapi/com/sun/star/sheet/XArrayFormulaRange.idl2
-rw-r--r--offapi/com/sun/star/sheet/XArrayFormulaTokens.idl5
-rw-r--r--offapi/com/sun/star/sheet/XCalculatable.idl2
-rw-r--r--offapi/com/sun/star/sheet/XCellAddressable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XCellRangeAddressable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XCellRangeData.idl2
-rw-r--r--offapi/com/sun/star/sheet/XCellRangeFormula.idl2
-rw-r--r--offapi/com/sun/star/sheet/XCellRangeMovement.idl14
-rw-r--r--offapi/com/sun/star/sheet/XCellRangeReferrer.idl5
-rw-r--r--offapi/com/sun/star/sheet/XCellRangesAccess.idl14
-rw-r--r--offapi/com/sun/star/sheet/XCellRangesQuery.idl11
-rw-r--r--offapi/com/sun/star/sheet/XCellSeries.idl11
-rw-r--r--offapi/com/sun/star/sheet/XCompatibilityNames.idl2
-rw-r--r--offapi/com/sun/star/sheet/XConsolidatable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XConsolidationDescriptor.idl11
-rw-r--r--offapi/com/sun/star/sheet/XDDELink.idl2
-rw-r--r--offapi/com/sun/star/sheet/XDDELinkResults.idl2
-rw-r--r--offapi/com/sun/star/sheet/XDDELinks.idl8
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl2
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotDescriptor.idl11
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotField.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl7
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotMemberResults.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotResults.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotTable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotTable2.idl18
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotTables.idl8
-rw-r--r--offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDatabaseRange.idl14
-rw-r--r--offapi/com/sun/star/sheet/XDatabaseRanges.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDimensionsSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XDocumentAuditing.idl2
-rw-r--r--offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl8
-rw-r--r--offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/sheet/XExternalSheetName.idl5
-rw-r--r--offapi/com/sun/star/sheet/XFillAcrossSheet.idl2
-rw-r--r--offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl5
-rw-r--r--offapi/com/sun/star/sheet/XFormulaQuery.idl5
-rw-r--r--offapi/com/sun/star/sheet/XFormulaTokens.idl5
-rw-r--r--offapi/com/sun/star/sheet/XFunctionAccess.idl8
-rw-r--r--offapi/com/sun/star/sheet/XFunctionDescriptions.idl8
-rw-r--r--offapi/com/sun/star/sheet/XGoalSeek.idl8
-rw-r--r--offapi/com/sun/star/sheet/XHeaderFooterContent.idl5
-rw-r--r--offapi/com/sun/star/sheet/XHierarchiesSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XLabelRange.idl5
-rw-r--r--offapi/com/sun/star/sheet/XLabelRanges.idl5
-rw-r--r--offapi/com/sun/star/sheet/XLevelsSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XMembersSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XMultiFormulaTokens.idl8
-rw-r--r--offapi/com/sun/star/sheet/XMultipleOperation.idl11
-rw-r--r--offapi/com/sun/star/sheet/XNamedRange.idl5
-rw-r--r--offapi/com/sun/star/sheet/XNamedRanges.idl11
-rw-r--r--offapi/com/sun/star/sheet/XPrintAreas.idl5
-rw-r--r--offapi/com/sun/star/sheet/XRangeSelection.idl5
-rw-r--r--offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl5
-rw-r--r--offapi/com/sun/star/sheet/XRangeSelectionListener.idl5
-rw-r--r--offapi/com/sun/star/sheet/XRecentFunctions.idl2
-rw-r--r--offapi/com/sun/star/sheet/XResultListener.idl5
-rw-r--r--offapi/com/sun/star/sheet/XScenario.idl5
-rw-r--r--offapi/com/sun/star/sheet/XScenarioEnhanced.idl5
-rw-r--r--offapi/com/sun/star/sheet/XScenarios.idl5
-rw-r--r--offapi/com/sun/star/sheet/XScenariosSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAnnotation.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAnnotations.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetAuditing.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetCellCursor.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSheetCellRange.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl8
-rw-r--r--offapi/com/sun/star/sheet/XSheetCellRanges.idl8
-rw-r--r--offapi/com/sun/star/sheet/XSheetCondition.idl8
-rw-r--r--offapi/com/sun/star/sheet/XSheetCondition2.idl11
-rw-r--r--offapi/com/sun/star/sheet/XSheetConditionalEntries.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetConditionalEntry.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSheetFilterable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetFilterableEx.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetLinkable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetOperation.idl8
-rw-r--r--offapi/com/sun/star/sheet/XSheetOutline.idl8
-rw-r--r--offapi/com/sun/star/sheet/XSheetPageBreak.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSheetPastable.idl14
-rw-r--r--offapi/com/sun/star/sheet/XSolver.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSolverDescription.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSpreadsheet.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSpreadsheetDocument.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSpreadsheetView.idl4
-rw-r--r--offapi/com/sun/star/sheet/XSpreadsheets.idl2
-rw-r--r--offapi/com/sun/star/sheet/XSubTotalCalculatable.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSubTotalDescriptor.idl5
-rw-r--r--offapi/com/sun/star/sheet/XSubTotalField.idl5
-rw-r--r--offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XUsedAreaCursor.idl2
-rw-r--r--offapi/com/sun/star/sheet/XViewFreezable.idl2
-rw-r--r--offapi/com/sun/star/sheet/XViewPane.idl4
-rw-r--r--offapi/com/sun/star/sheet/XViewPanesSupplier.idl5
-rw-r--r--offapi/com/sun/star/sheet/XViewSplitable.idl2
-rw-r--r--offapi/com/sun/star/sheet/XVolatileResult.idl5
-rw-r--r--offapi/com/sun/star/smarttags/XSmartTagAction.idl20
-rw-r--r--offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl20
-rw-r--r--offapi/com/sun/star/style/CellStyle.idl2
-rw-r--r--offapi/com/sun/star/style/CharacterProperties.idl11
-rw-r--r--offapi/com/sun/star/style/CharacterPropertiesAsian.idl4
-rw-r--r--offapi/com/sun/star/style/CharacterPropertiesComplex.idl4
-rw-r--r--offapi/com/sun/star/style/CharacterStyle.idl5
-rw-r--r--offapi/com/sun/star/style/NumberingAlignment.idl2
-rw-r--r--offapi/com/sun/star/style/NumberingRule.idl4
-rw-r--r--offapi/com/sun/star/style/PageProperties.idl29
-rw-r--r--offapi/com/sun/star/style/PageStyle.idl5
-rw-r--r--offapi/com/sun/star/style/ParagraphProperties.idl28
-rw-r--r--offapi/com/sun/star/style/ParagraphStyle.idl8
-rw-r--r--offapi/com/sun/star/style/Style.idl13
-rw-r--r--offapi/com/sun/star/style/StyleFamilies.idl4
-rw-r--r--offapi/com/sun/star/style/StyleFamily.idl4
-rw-r--r--offapi/com/sun/star/style/TabStop.idl2
-rw-r--r--offapi/com/sun/star/style/XAutoStyle.idl13
-rw-r--r--offapi/com/sun/star/style/XAutoStyleFamily.idl6
-rw-r--r--offapi/com/sun/star/style/XAutoStyles.idl4
-rw-r--r--offapi/com/sun/star/style/XAutoStylesSupplier.idl5
-rw-r--r--offapi/com/sun/star/style/XDefaultsSupplier.idl4
-rw-r--r--offapi/com/sun/star/style/XStyle.idl4
-rw-r--r--offapi/com/sun/star/style/XStyleCondition.idl2
-rw-r--r--offapi/com/sun/star/style/XStyleFamiliesSupplier.idl4
-rw-r--r--offapi/com/sun/star/style/XStyleLoader.idl8
-rw-r--r--offapi/com/sun/star/svg/XSVGPrinter.idl2
-rw-r--r--offapi/com/sun/star/svg/XSVGWriter.idl2
-rw-r--r--offapi/com/sun/star/sync/SyncCollector.idl2
-rw-r--r--offapi/com/sun/star/sync/SyncInfo.idl2
-rw-r--r--offapi/com/sun/star/sync/Synchronizer.idl2
-rw-r--r--offapi/com/sun/star/sync/XSyncCollector.idl10
-rw-r--r--offapi/com/sun/star/sync/XSynchronizer.idl4
-rw-r--r--offapi/com/sun/star/sync2/BadPartnershipException.idl2
-rw-r--r--offapi/com/sun/star/system/ProxySettings.idl5
-rw-r--r--offapi/com/sun/star/system/SOffice52ProxySettings.idl8
-rw-r--r--offapi/com/sun/star/system/SimpleCommandMail.idl8
-rw-r--r--offapi/com/sun/star/system/SimpleSystemMail.idl5
-rw-r--r--offapi/com/sun/star/system/SystemProxySettings.idl8
-rw-r--r--offapi/com/sun/star/system/SystemShellExecute.idl5
-rw-r--r--offapi/com/sun/star/system/SystemShellExecuteException.idl2
-rw-r--r--offapi/com/sun/star/system/XProxySettings.idl5
-rw-r--r--offapi/com/sun/star/system/XSimpleMailClient.idl14
-rw-r--r--offapi/com/sun/star/system/XSimpleMailClientSupplier.idl11
-rw-r--r--offapi/com/sun/star/system/XSimpleMailMessage.idl8
-rw-r--r--offapi/com/sun/star/system/XSystemShellExecute.idl11
-rw-r--r--offapi/com/sun/star/table/AccessibleCellView.idl17
-rw-r--r--offapi/com/sun/star/table/AccessibleTableView.idl14
-rw-r--r--offapi/com/sun/star/table/BorderLine.idl2
-rw-r--r--offapi/com/sun/star/table/Cell.idl8
-rw-r--r--offapi/com/sun/star/table/CellCursor.idl2
-rw-r--r--offapi/com/sun/star/table/CellProperties.idl29
-rw-r--r--offapi/com/sun/star/table/CellRange.idl5
-rw-r--r--offapi/com/sun/star/table/CellRangeListSource.idl6
-rw-r--r--offapi/com/sun/star/table/CellValueBinding.idl6
-rw-r--r--offapi/com/sun/star/table/ListPositionCellBinding.idl2
-rw-r--r--offapi/com/sun/star/table/ShadowFormat.idl5
-rw-r--r--offapi/com/sun/star/table/TableBorder.idl2
-rw-r--r--offapi/com/sun/star/table/TableBorderDistances.idl2
-rw-r--r--offapi/com/sun/star/table/TableChart.idl8
-rw-r--r--offapi/com/sun/star/table/TableCharts.idl8
-rw-r--r--offapi/com/sun/star/table/TableChartsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/table/TableColumn.idl8
-rw-r--r--offapi/com/sun/star/table/TableColumns.idl8
-rw-r--r--offapi/com/sun/star/table/TableColumnsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/table/TableRow.idl5
-rw-r--r--offapi/com/sun/star/table/TableRows.idl5
-rw-r--r--offapi/com/sun/star/table/TableRowsEnumeration.idl2
-rw-r--r--offapi/com/sun/star/table/TableSortDescriptor.idl8
-rw-r--r--offapi/com/sun/star/table/TableSortDescriptor2.idl6
-rw-r--r--offapi/com/sun/star/table/TableSortField.idl4
-rw-r--r--offapi/com/sun/star/table/XAutoFormattable.idl5
-rw-r--r--offapi/com/sun/star/table/XCell.idl5
-rw-r--r--offapi/com/sun/star/table/XCellCursor.idl2
-rw-r--r--offapi/com/sun/star/table/XCellRange.idl8
-rw-r--r--offapi/com/sun/star/table/XColumnRowRange.idl8
-rw-r--r--offapi/com/sun/star/table/XMergeableCell.idl5
-rw-r--r--offapi/com/sun/star/table/XMergeableCellRange.idl8
-rw-r--r--offapi/com/sun/star/table/XTable.idl26
-rw-r--r--offapi/com/sun/star/table/XTableChart.idl5
-rw-r--r--offapi/com/sun/star/table/XTableCharts.idl8
-rw-r--r--offapi/com/sun/star/table/XTableChartsSupplier.idl5
-rw-r--r--offapi/com/sun/star/table/XTableColumns.idl2
-rw-r--r--offapi/com/sun/star/table/XTableRows.idl2
-rw-r--r--offapi/com/sun/star/task/AsyncJob.idl5
-rw-r--r--offapi/com/sun/star/task/ClassifiedInteractionRequest.idl4
-rw-r--r--offapi/com/sun/star/task/DocumentMSPasswordRequest.idl2
-rw-r--r--offapi/com/sun/star/task/DocumentPasswordRequest.idl2
-rw-r--r--offapi/com/sun/star/task/ErrorCodeIOException.idl2
-rw-r--r--offapi/com/sun/star/task/ErrorCodeRequest.idl2
-rw-r--r--offapi/com/sun/star/task/Job.idl5
-rw-r--r--offapi/com/sun/star/task/JobExecutor.idl2
-rw-r--r--offapi/com/sun/star/task/MasterPasswordRequest.idl2
-rw-r--r--offapi/com/sun/star/task/NoMasterException.idl5
-rw-r--r--offapi/com/sun/star/task/PDFExportException.idl2
-rw-r--r--offapi/com/sun/star/task/PasswordRequest.idl5
-rw-r--r--offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl2
-rw-r--r--offapi/com/sun/star/task/UrlRecord.idl2
-rw-r--r--offapi/com/sun/star/task/XAsyncJob.idl8
-rw-r--r--offapi/com/sun/star/task/XInteractionApprove.idl2
-rw-r--r--offapi/com/sun/star/task/XInteractionDisapprove.idl2
-rw-r--r--offapi/com/sun/star/task/XInteractionPassword.idl2
-rw-r--r--offapi/com/sun/star/task/XInteractionPassword2.idl2
-rw-r--r--offapi/com/sun/star/task/XInteractionRequestStringResolver.idl6
-rw-r--r--offapi/com/sun/star/task/XJob.idl8
-rw-r--r--offapi/com/sun/star/task/XJobExecutor.idl2
-rw-r--r--offapi/com/sun/star/task/XJobListener.idl2
-rw-r--r--offapi/com/sun/star/task/XMasterPasswordHandling.idl5
-rw-r--r--offapi/com/sun/star/task/XMasterPasswordHandling2.idl5
-rw-r--r--offapi/com/sun/star/task/XPasswordContainer.idl8
-rw-r--r--offapi/com/sun/star/task/XRestartManager.idl8
-rw-r--r--offapi/com/sun/star/task/XStatusIndicator.idl2
-rw-r--r--offapi/com/sun/star/task/XStatusIndicatorFactory.idl5
-rw-r--r--offapi/com/sun/star/task/XStatusIndicatorSupplier.idl5
-rw-r--r--offapi/com/sun/star/task/XUrlContainer.idl5
-rw-r--r--offapi/com/sun/star/text/AccessibleEndnoteView.idl8
-rw-r--r--offapi/com/sun/star/text/AccessibleFootnoteView.idl8
-rw-r--r--offapi/com/sun/star/text/AccessibleHeaderFooterView.idl8
-rw-r--r--offapi/com/sun/star/text/AccessiblePageView.idl8
-rw-r--r--offapi/com/sun/star/text/AccessibleParagraphView.idl14
-rw-r--r--offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl11
-rw-r--r--offapi/com/sun/star/text/AccessibleTextDocumentView.idl11
-rw-r--r--offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl11
-rw-r--r--offapi/com/sun/star/text/AccessibleTextFrameView.idl7
-rw-r--r--offapi/com/sun/star/text/AccessibleTextGraphicObject.idl11
-rw-r--r--offapi/com/sun/star/text/AdvancedTextDocument.idl20
-rw-r--r--offapi/com/sun/star/text/AutoTextContainer.idl5
-rw-r--r--offapi/com/sun/star/text/AutoTextEntry.idl5
-rw-r--r--offapi/com/sun/star/text/AutoTextGroup.idl6
-rw-r--r--offapi/com/sun/star/text/BaseFrame.idl22
-rw-r--r--offapi/com/sun/star/text/BaseFrameProperties.idl16
-rw-r--r--offapi/com/sun/star/text/BaseIndex.idl16
-rw-r--r--offapi/com/sun/star/text/BaseIndexMark.idl2
-rw-r--r--offapi/com/sun/star/text/Bookmark.idl4
-rw-r--r--offapi/com/sun/star/text/Bookmarks.idl4
-rw-r--r--offapi/com/sun/star/text/Cell.idl11
-rw-r--r--offapi/com/sun/star/text/CellProperties.idl16
-rw-r--r--offapi/com/sun/star/text/CellRange.idl30
-rw-r--r--offapi/com/sun/star/text/ChainedTextFrame.idl4
-rw-r--r--offapi/com/sun/star/text/ChapterNumberingRule.idl2
-rw-r--r--offapi/com/sun/star/text/ContentIndexMark.idl4
-rw-r--r--offapi/com/sun/star/text/Defaults.idl15
-rw-r--r--offapi/com/sun/star/text/DependentTextField.idl4
-rw-r--r--offapi/com/sun/star/text/DocumentIndex.idl2
-rw-r--r--offapi/com/sun/star/text/DocumentIndexLevelFormat.idl2
-rw-r--r--offapi/com/sun/star/text/DocumentIndexMark.idl4
-rw-r--r--offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl2
-rw-r--r--offapi/com/sun/star/text/DocumentIndexes.idl5
-rw-r--r--offapi/com/sun/star/text/DocumentSettings.idl11
-rw-r--r--offapi/com/sun/star/text/Endnote.idl2
-rw-r--r--offapi/com/sun/star/text/EndnoteSettings.idl2
-rw-r--r--offapi/com/sun/star/text/Footnote.idl5
-rw-r--r--offapi/com/sun/star/text/Footnotes.idl2
-rw-r--r--offapi/com/sun/star/text/GenericTextDocument.idl68
-rw-r--r--offapi/com/sun/star/text/GlobalDocument.idl2
-rw-r--r--offapi/com/sun/star/text/GlobalSettings.idl4
-rw-r--r--offapi/com/sun/star/text/HypertextDocument.idl8
-rw-r--r--offapi/com/sun/star/text/InContentMetadata.idl11
-rw-r--r--offapi/com/sun/star/text/InvalidTextContentException.idl4
-rw-r--r--offapi/com/sun/star/text/LineNumberingProperties.idl2
-rw-r--r--offapi/com/sun/star/text/MailMerge.idl14
-rw-r--r--offapi/com/sun/star/text/MailMergeEvent.idl4
-rw-r--r--offapi/com/sun/star/text/NumberingLevel.idl11
-rw-r--r--offapi/com/sun/star/text/NumberingRules.idl4
-rw-r--r--offapi/com/sun/star/text/NumberingStyle.idl4
-rw-r--r--offapi/com/sun/star/text/PageFootnoteInfo.idl2
-rw-r--r--offapi/com/sun/star/text/Paragraph.idl31
-rw-r--r--offapi/com/sun/star/text/ParagraphEnumeration.idl2
-rw-r--r--offapi/com/sun/star/text/PrintPreviewSettings.idl2
-rw-r--r--offapi/com/sun/star/text/PrintSettings.idl2
-rw-r--r--offapi/com/sun/star/text/RedlinePortion.idl6
-rw-r--r--offapi/com/sun/star/text/ReferenceMark.idl5
-rw-r--r--offapi/com/sun/star/text/ReferenceMarks.idl5
-rw-r--r--offapi/com/sun/star/text/Shape.idl12
-rw-r--r--offapi/com/sun/star/text/TableColumns.idl8
-rw-r--r--offapi/com/sun/star/text/TableRows.idl5
-rw-r--r--offapi/com/sun/star/text/Text.idl6
-rw-r--r--offapi/com/sun/star/text/TextColumnSequence.idl2
-rw-r--r--offapi/com/sun/star/text/TextColumns.idl8
-rw-r--r--offapi/com/sun/star/text/TextContent.idl8
-rw-r--r--offapi/com/sun/star/text/TextContentCollection.idl4
-rw-r--r--offapi/com/sun/star/text/TextCursor.idl29
-rw-r--r--offapi/com/sun/star/text/TextDocument.idl2
-rw-r--r--offapi/com/sun/star/text/TextDocumentView.idl8
-rw-r--r--offapi/com/sun/star/text/TextEmbeddedObject.idl7
-rw-r--r--offapi/com/sun/star/text/TextEmbeddedObjects.idl5
-rw-r--r--offapi/com/sun/star/text/TextField.idl8
-rw-r--r--offapi/com/sun/star/text/TextFieldEnumeration.idl2
-rw-r--r--offapi/com/sun/star/text/TextFieldMaster.idl4
-rw-r--r--offapi/com/sun/star/text/TextFieldMasters.idl2
-rw-r--r--offapi/com/sun/star/text/TextFields.idl5
-rw-r--r--offapi/com/sun/star/text/TextFrame.idl5
-rw-r--r--offapi/com/sun/star/text/TextFrames.idl7
-rw-r--r--offapi/com/sun/star/text/TextGraphicObject.idl14
-rw-r--r--offapi/com/sun/star/text/TextGraphicObjects.idl5
-rw-r--r--offapi/com/sun/star/text/TextLayoutCursor.idl5
-rw-r--r--offapi/com/sun/star/text/TextMarkupDescriptor.idl5
-rw-r--r--offapi/com/sun/star/text/TextPageStyle.idl19
-rw-r--r--offapi/com/sun/star/text/TextPortion.idl17
-rw-r--r--offapi/com/sun/star/text/TextPortionEnumeration.idl2
-rw-r--r--offapi/com/sun/star/text/TextRange.idl24
-rw-r--r--offapi/com/sun/star/text/TextRangeContentProperties.idl23
-rw-r--r--offapi/com/sun/star/text/TextRanges.idl2
-rw-r--r--offapi/com/sun/star/text/TextSection.idl23
-rw-r--r--offapi/com/sun/star/text/TextSections.idl4
-rw-r--r--offapi/com/sun/star/text/TextSortDescriptor.idl2
-rw-r--r--offapi/com/sun/star/text/TextSortDescriptor2.idl6
-rw-r--r--offapi/com/sun/star/text/TextSortable.idl5
-rw-r--r--offapi/com/sun/star/text/TextTable.idl37
-rw-r--r--offapi/com/sun/star/text/TextTableCursor.idl15
-rw-r--r--offapi/com/sun/star/text/TextTableRow.idl11
-rw-r--r--offapi/com/sun/star/text/TextTables.idl4
-rw-r--r--offapi/com/sun/star/text/TextViewCursor.idl5
-rw-r--r--offapi/com/sun/star/text/UserDefinedIndex.idl2
-rw-r--r--offapi/com/sun/star/text/UserIndexMark.idl4
-rw-r--r--offapi/com/sun/star/text/ViewSettings.idl6
-rw-r--r--offapi/com/sun/star/text/WebDocument.idl2
-rw-r--r--offapi/com/sun/star/text/XAutoTextContainer.idl10
-rw-r--r--offapi/com/sun/star/text/XAutoTextEntry.idl4
-rw-r--r--offapi/com/sun/star/text/XAutoTextGroup.idl14
-rw-r--r--offapi/com/sun/star/text/XBookmarkInsertTool.idl6
-rw-r--r--offapi/com/sun/star/text/XBookmarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XChapterNumberingSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XDefaultNumberingProvider.idl6
-rw-r--r--offapi/com/sun/star/text/XDependentTextField.idl6
-rw-r--r--offapi/com/sun/star/text/XDocumentIndex.idl2
-rw-r--r--offapi/com/sun/star/text/XDocumentIndexMark.idl2
-rw-r--r--offapi/com/sun/star/text/XDocumentIndexesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XEndnotesSupplier.idl6
-rw-r--r--offapi/com/sun/star/text/XFlatParagraph.idl14
-rw-r--r--offapi/com/sun/star/text/XFlatParagraphIterator.idl8
-rw-r--r--offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl8
-rw-r--r--offapi/com/sun/star/text/XFootnote.idl2
-rw-r--r--offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XFootnotesSupplier.idl6
-rw-r--r--offapi/com/sun/star/text/XHeaderFooter.idl5
-rw-r--r--offapi/com/sun/star/text/XHeaderFooterPageStyle.idl5
-rw-r--r--offapi/com/sun/star/text/XLineNumberingProperties.idl5
-rw-r--r--offapi/com/sun/star/text/XLineNumberingSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XMailMergeBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/text/XMailMergeListener.idl4
-rw-r--r--offapi/com/sun/star/text/XModule.idl2
-rw-r--r--offapi/com/sun/star/text/XMultiTextMarkup.idl8
-rw-r--r--offapi/com/sun/star/text/XNumberingFormatter.idl8
-rw-r--r--offapi/com/sun/star/text/XNumberingRulesSupplier.idl5
-rw-r--r--offapi/com/sun/star/text/XNumberingTypeInfo.idl2
-rw-r--r--offapi/com/sun/star/text/XPageCursor.idl2
-rw-r--r--offapi/com/sun/star/text/XPagePrintable.idl8
-rw-r--r--offapi/com/sun/star/text/XParagraphAppend.idl12
-rw-r--r--offapi/com/sun/star/text/XParagraphCursor.idl2
-rw-r--r--offapi/com/sun/star/text/XRedline.idl4
-rw-r--r--offapi/com/sun/star/text/XReferenceMarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XRelativeTextContentInsert.idl4
-rw-r--r--offapi/com/sun/star/text/XRelativeTextContentRemove.idl4
-rw-r--r--offapi/com/sun/star/text/XRubySelection.idl4
-rw-r--r--offapi/com/sun/star/text/XSentenceCursor.idl2
-rw-r--r--offapi/com/sun/star/text/XSimpleText.idl10
-rw-r--r--offapi/com/sun/star/text/XText.idl10
-rw-r--r--offapi/com/sun/star/text/XTextAppend.idl6
-rw-r--r--offapi/com/sun/star/text/XTextAppendAndConvert.idl6
-rw-r--r--offapi/com/sun/star/text/XTextColumns.idl4
-rw-r--r--offapi/com/sun/star/text/XTextContent.idl8
-rw-r--r--offapi/com/sun/star/text/XTextContentAppend.idl13
-rw-r--r--offapi/com/sun/star/text/XTextConvert.idl17
-rw-r--r--offapi/com/sun/star/text/XTextCopy.idl2
-rw-r--r--offapi/com/sun/star/text/XTextCursor.idl2
-rw-r--r--offapi/com/sun/star/text/XTextDocument.idl4
-rw-r--r--offapi/com/sun/star/text/XTextEmbeddedObject.idl4
-rw-r--r--offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextField.idl2
-rw-r--r--offapi/com/sun/star/text/XTextFieldsSupplier.idl8
-rw-r--r--offapi/com/sun/star/text/XTextFrame.idl5
-rw-r--r--offapi/com/sun/star/text/XTextFramesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextMarkup.idl5
-rw-r--r--offapi/com/sun/star/text/XTextPortionAppend.idl13
-rw-r--r--offapi/com/sun/star/text/XTextRange.idl2
-rw-r--r--offapi/com/sun/star/text/XTextRangeCompare.idl4
-rw-r--r--offapi/com/sun/star/text/XTextRangeMover.idl4
-rw-r--r--offapi/com/sun/star/text/XTextSection.idl2
-rw-r--r--offapi/com/sun/star/text/XTextSectionsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextShapesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextTable.idl10
-rw-r--r--offapi/com/sun/star/text/XTextTableCursor.idl2
-rw-r--r--offapi/com/sun/star/text/XTextTablesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextViewCursor.idl4
-rw-r--r--offapi/com/sun/star/text/XTextViewCursorSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XWordCursor.idl2
-rw-r--r--offapi/com/sun/star/text/textfield/MetadataField.idl14
-rw-r--r--offapi/com/sun/star/ucb/AlreadyInitializedException.idl2
-rw-r--r--offapi/com/sun/star/ucb/AnyCompareFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/AuthenticationRequest.idl2
-rw-r--r--offapi/com/sun/star/ucb/CHAOSProgressStart.idl2
-rw-r--r--offapi/com/sun/star/ucb/CachedContentResultSet.idl2
-rw-r--r--offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/CachedContentResultSetStub.idl8
-rw-r--r--offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/CachedDynamicResultSet.idl5
-rw-r--r--offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl5
-rw-r--r--offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/CertificateValidationRequest.idl5
-rw-r--r--offapi/com/sun/star/ucb/Command.idl2
-rw-r--r--offapi/com/sun/star/ucb/CommandAbortedException.idl2
-rw-r--r--offapi/com/sun/star/ucb/CommandFailedException.idl2
-rw-r--r--offapi/com/sun/star/ucb/CommandInfo.idl2
-rw-r--r--offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/ucb/Content.idl32
-rw-r--r--offapi/com/sun/star/ucb/ContentCreationException.idl5
-rw-r--r--offapi/com/sun/star/ucb/ContentEvent.idl2
-rw-r--r--offapi/com/sun/star/ucb/ContentInfo.idl2
-rw-r--r--offapi/com/sun/star/ucb/ContentProvider.idl11
-rw-r--r--offapi/com/sun/star/ucb/ContentProviderInfo.idl2
-rw-r--r--offapi/com/sun/star/ucb/ContentProviderProxy.idl8
-rw-r--r--offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/ContentResultSet.idl23
-rw-r--r--offapi/com/sun/star/ucb/ContentTransmitter.idl2
-rw-r--r--offapi/com/sun/star/ucb/Cookie.idl5
-rw-r--r--offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl2
-rw-r--r--offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl2
-rw-r--r--offapi/com/sun/star/ucb/DuplicateProviderException.idl2
-rw-r--r--offapi/com/sun/star/ucb/DynamicResultSet.idl2
-rw-r--r--offapi/com/sun/star/ucb/ExportStreamInfo.idl2
-rw-r--r--offapi/com/sun/star/ucb/FTPContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/FTPContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/FileContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/FileContentProvider.idl8
-rw-r--r--offapi/com/sun/star/ucb/FolderList.idl5
-rw-r--r--offapi/com/sun/star/ucb/GIOContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl2
-rw-r--r--offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/HandleCookiesRequest.idl8
-rw-r--r--offapi/com/sun/star/ucb/HelpContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/HelpContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/HierarchyContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl8
-rw-r--r--offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl8
-rw-r--r--offapi/com/sun/star/ucb/HierarchyDataSource.idl4
-rw-r--r--offapi/com/sun/star/ucb/HierarchyFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/HierarchyLinkContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/IllegalIdentifierException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InsertCommandArgument.idl5
-rw-r--r--offapi/com/sun/star/ucb/InteractiveAppException.idl5
-rw-r--r--offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveCHAOSException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveFileIOException.idl5
-rw-r--r--offapi/com/sun/star/ucb/InteractiveIOException.idl5
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl2
-rw-r--r--offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl2
-rw-r--r--offapi/com/sun/star/ucb/ListEvent.idl5
-rw-r--r--offapi/com/sun/star/ucb/ListenerAlreadySetException.idl2
-rw-r--r--offapi/com/sun/star/ucb/Lock.idl4
-rw-r--r--offapi/com/sun/star/ucb/LockEntry.idl4
-rw-r--r--offapi/com/sun/star/ucb/MissingInputStreamException.idl2
-rw-r--r--offapi/com/sun/star/ucb/MissingPropertiesException.idl2
-rw-r--r--offapi/com/sun/star/ucb/NameClashException.idl2
-rw-r--r--offapi/com/sun/star/ucb/NameClashResolveRequest.idl2
-rw-r--r--offapi/com/sun/star/ucb/ODMAContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/ODMAContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/OpenCommandArgument.idl5
-rw-r--r--offapi/com/sun/star/ucb/OpenCommandArgument2.idl5
-rw-r--r--offapi/com/sun/star/ucb/PackageContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/PackageFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/PackageStreamContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/PersistentPropertySet.idl8
-rw-r--r--offapi/com/sun/star/ucb/PostCommandArgument.idl2
-rw-r--r--offapi/com/sun/star/ucb/PostCommandArgument2.idl2
-rw-r--r--offapi/com/sun/star/ucb/PropertiesManager.idl2
-rw-r--r--offapi/com/sun/star/ucb/PropertySetRegistry.idl4
-rw-r--r--offapi/com/sun/star/ucb/PropertyValueInfo.idl5
-rw-r--r--offapi/com/sun/star/ucb/RecipientInfo.idl2
-rw-r--r--offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl5
-rw-r--r--offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl4
-rw-r--r--offapi/com/sun/star/ucb/ResultSetException.idl2
-rw-r--r--offapi/com/sun/star/ucb/Rule.idl2
-rw-r--r--offapi/com/sun/star/ucb/RuleSet.idl2
-rw-r--r--offapi/com/sun/star/ucb/SearchCommandArgument.idl8
-rw-r--r--offapi/com/sun/star/ucb/SearchCriterium.idl2
-rw-r--r--offapi/com/sun/star/ucb/SearchInfo.idl5
-rw-r--r--offapi/com/sun/star/ucb/ServiceNotFoundException.idl2
-rw-r--r--offapi/com/sun/star/ucb/SimpleFileAccess.idl2
-rw-r--r--offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl2
-rw-r--r--offapi/com/sun/star/ucb/Store.idl2
-rw-r--r--offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/URLAuthenticationRequest.idl2
-rw-r--r--offapi/com/sun/star/ucb/UniversalContentBroker.idl20
-rw-r--r--offapi/com/sun/star/ucb/UnsupportedCommandException.idl2
-rw-r--r--offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl4
-rw-r--r--offapi/com/sun/star/ucb/UnsupportedNameClashException.idl2
-rw-r--r--offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl2
-rw-r--r--offapi/com/sun/star/ucb/WebDAVContentProvider.idl2
-rw-r--r--offapi/com/sun/star/ucb/WebDAVDocumentContent.idl26
-rw-r--r--offapi/com/sun/star/ucb/WebDAVFolderContent.idl29
-rw-r--r--offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl2
-rw-r--r--offapi/com/sun/star/ucb/XAnyCompare.idl2
-rw-r--r--offapi/com/sun/star/ucb/XAnyCompareFactory.idl8
-rw-r--r--offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl8
-rw-r--r--offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl5
-rw-r--r--offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl8
-rw-r--r--offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl11
-rw-r--r--offapi/com/sun/star/ucb/XCommandEnvironment.idl8
-rw-r--r--offapi/com/sun/star/ucb/XCommandInfo.idl8
-rw-r--r--offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl5
-rw-r--r--offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl4
-rw-r--r--offapi/com/sun/star/ucb/XCommandProcessor.idl11
-rw-r--r--offapi/com/sun/star/ucb/XCommandProcessor2.idl2
-rw-r--r--offapi/com/sun/star/ucb/XContent.idl8
-rw-r--r--offapi/com/sun/star/ucb/XContentAccess.idl2
-rw-r--r--offapi/com/sun/star/ucb/XContentCreator.idl8
-rw-r--r--offapi/com/sun/star/ucb/XContentEventListener.idl5
-rw-r--r--offapi/com/sun/star/ucb/XContentIdentifier.idl2
-rw-r--r--offapi/com/sun/star/ucb/XContentIdentifierFactory.idl5
-rw-r--r--offapi/com/sun/star/ucb/XContentIdentifierMapping.idl2
-rw-r--r--offapi/com/sun/star/ucb/XContentProvider.idl11
-rw-r--r--offapi/com/sun/star/ucb/XContentProviderFactory.idl5
-rw-r--r--offapi/com/sun/star/ucb/XContentProviderManager.idl11
-rw-r--r--offapi/com/sun/star/ucb/XContentProviderSupplier.idl5
-rw-r--r--offapi/com/sun/star/ucb/XContentTransmitter.idl2
-rw-r--r--offapi/com/sun/star/ucb/XDataContainer.idl2
-rw-r--r--offapi/com/sun/star/ucb/XDynamicResultSet.idl17
-rw-r--r--offapi/com/sun/star/ucb/XDynamicResultSetListener.idl5
-rw-r--r--offapi/com/sun/star/ucb/XFetchProvider.idl5
-rw-r--r--offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl5
-rw-r--r--offapi/com/sun/star/ucb/XFileIdentifierConverter.idl2
-rw-r--r--offapi/com/sun/star/ucb/XInteractionCookieHandling.idl8
-rw-r--r--offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl2
-rw-r--r--offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl2
-rw-r--r--offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl5
-rw-r--r--offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl2
-rw-r--r--offapi/com/sun/star/ucb/XInteractionSupplyName.idl2
-rw-r--r--offapi/com/sun/star/ucb/XParameterizedContentProvider.idl8
-rw-r--r--offapi/com/sun/star/ucb/XPersistentPropertySet.idl2
-rw-r--r--offapi/com/sun/star/ucb/XProgressHandler.idl2
-rw-r--r--offapi/com/sun/star/ucb/XPropertyMatcher.idl8
-rw-r--r--offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl8
-rw-r--r--offapi/com/sun/star/ucb/XPropertySetRegistry.idl5
-rw-r--r--offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl5
-rw-r--r--offapi/com/sun/star/ucb/XRecycler.idl8
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl5
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl2
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl4
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl2
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl2
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl11
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl2
-rw-r--r--offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl5
-rw-r--r--offapi/com/sun/star/ucb/XSimpleFileAccess.idl26
-rw-r--r--offapi/com/sun/star/ucb/XSimpleFileAccess2.idl8
-rw-r--r--offapi/com/sun/star/ucb/XSimpleFileAccess3.idl8
-rw-r--r--offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl9
-rw-r--r--offapi/com/sun/star/ucb/XSourceInitialization.idl5
-rw-r--r--offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl4
-rw-r--r--offapi/com/sun/star/ui/ActionTrigger.idl6
-rw-r--r--offapi/com/sun/star/ui/ActionTriggerContainer.idl8
-rw-r--r--offapi/com/sun/star/ui/ConfigurableUIElement.idl20
-rw-r--r--offapi/com/sun/star/ui/ConfigurationEvent.idl2
-rw-r--r--offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl8
-rw-r--r--offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl2
-rw-r--r--offapi/com/sun/star/ui/ItemDescriptor.idl2
-rw-r--r--offapi/com/sun/star/ui/ModuleUICategoryDescription.idl2
-rw-r--r--offapi/com/sun/star/ui/ModuleUICommandDescription.idl2
-rw-r--r--offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl14
-rw-r--r--offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl5
-rw-r--r--offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl2
-rw-r--r--offapi/com/sun/star/ui/UICategoryDescription.idl2
-rw-r--r--offapi/com/sun/star/ui/UICommandDescription.idl2
-rw-r--r--offapi/com/sun/star/ui/UIConfigurationManager.idl14
-rw-r--r--offapi/com/sun/star/ui/UIElement.idl14
-rw-r--r--offapi/com/sun/star/ui/UIElementFactory.idl2
-rw-r--r--offapi/com/sun/star/ui/UIElementFactoryManager.idl5
-rw-r--r--offapi/com/sun/star/ui/UIElementSettings.idl5
-rw-r--r--offapi/com/sun/star/ui/WindowContentFactory.idl2
-rw-r--r--offapi/com/sun/star/ui/WindowStateConfiguration.idl2
-rw-r--r--offapi/com/sun/star/ui/XAcceleratorConfiguration.idl17
-rw-r--r--offapi/com/sun/star/ui/XContextMenuInterception.idl2
-rw-r--r--offapi/com/sun/star/ui/XContextMenuInterceptor.idl7
-rw-r--r--offapi/com/sun/star/ui/XDockingAreaAcceptor.idl8
-rw-r--r--offapi/com/sun/star/ui/XImageManager.idl26
-rw-r--r--offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl14
-rw-r--r--offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl5
-rw-r--r--offapi/com/sun/star/ui/XUIConfiguration.idl2
-rw-r--r--offapi/com/sun/star/ui/XUIConfigurationListener.idl5
-rw-r--r--offapi/com/sun/star/ui/XUIConfigurationManager.idl26
-rw-r--r--offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl2
-rw-r--r--offapi/com/sun/star/ui/XUIConfigurationPersistence.idl2
-rw-r--r--offapi/com/sun/star/ui/XUIConfigurationStorage.idl2
-rw-r--r--offapi/com/sun/star/ui/XUIElement.idl8
-rw-r--r--offapi/com/sun/star/ui/XUIElementFactory.idl11
-rw-r--r--offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl14
-rw-r--r--offapi/com/sun/star/ui/XUIElementSettings.idl5
-rw-r--r--offapi/com/sun/star/ui/XUIFunctionListener.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/FilePicker.idl14
-rw-r--r--offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/FolderPicker.idl11
-rw-r--r--offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XControlAccess.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XControlInformation.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePicker.idl8
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePicker2.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePreview.idl8
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilterManager.idl5
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFolderPicker.idl8
-rw-r--r--offapi/com/sun/star/util/ChangesEvent.idl6
-rw-r--r--offapi/com/sun/star/util/ChangesSet.idl4
-rw-r--r--offapi/com/sun/star/util/CloseVetoException.idl2
-rw-r--r--offapi/com/sun/star/util/DataEditorEvent.idl4
-rw-r--r--offapi/com/sun/star/util/DiskFullException.idl2
-rw-r--r--offapi/com/sun/star/util/FileIOException.idl2
-rw-r--r--offapi/com/sun/star/util/JobManager.idl2
-rw-r--r--offapi/com/sun/star/util/MalformedNumberFormatException.idl2
-rw-r--r--offapi/com/sun/star/util/ModeChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/util/NotNumericException.idl2
-rw-r--r--offapi/com/sun/star/util/NumberFormatProperties.idl2
-rw-r--r--offapi/com/sun/star/util/NumberFormatSettings.idl4
-rw-r--r--offapi/com/sun/star/util/NumberFormats.idl4
-rw-r--r--offapi/com/sun/star/util/NumberFormatsSupplier.idl5
-rw-r--r--offapi/com/sun/star/util/NumberFormatter.idl4
-rw-r--r--offapi/com/sun/star/util/OfficeInstallationDirectories.idl2
-rw-r--r--offapi/com/sun/star/util/PathSettings.idl8
-rw-r--r--offapi/com/sun/star/util/PathSubstitution.idl8
-rw-r--r--offapi/com/sun/star/util/ReplaceDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SearchDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SortDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SortField.idl2
-rw-r--r--offapi/com/sun/star/util/Sortable.idl5
-rw-r--r--offapi/com/sun/star/util/TextSearch.idl2
-rw-r--r--offapi/com/sun/star/util/URLTransformer.idl2
-rw-r--r--offapi/com/sun/star/util/UriAbbreviation.idl2
-rw-r--r--offapi/com/sun/star/util/VetoException.idl2
-rw-r--r--offapi/com/sun/star/util/XArchiver.idl6
-rw-r--r--offapi/com/sun/star/util/XAtomServer.idl8
-rw-r--r--offapi/com/sun/star/util/XBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/util/XCancelManager.idl4
-rw-r--r--offapi/com/sun/star/util/XCancellable.idl2
-rw-r--r--offapi/com/sun/star/util/XChainable.idl4
-rw-r--r--offapi/com/sun/star/util/XChangesBatch.idl6
-rw-r--r--offapi/com/sun/star/util/XChangesListener.idl4
-rw-r--r--offapi/com/sun/star/util/XChangesNotifier.idl2
-rw-r--r--offapi/com/sun/star/util/XChangesSet.idl6
-rw-r--r--offapi/com/sun/star/util/XCloneable.idl2
-rw-r--r--offapi/com/sun/star/util/XCloseBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/util/XCloseListener.idl8
-rw-r--r--offapi/com/sun/star/util/XCloseable.idl5
-rw-r--r--offapi/com/sun/star/util/XDataEditor.idl4
-rw-r--r--offapi/com/sun/star/util/XDataEditorListener.idl4
-rw-r--r--offapi/com/sun/star/util/XFlushListener.idl4
-rw-r--r--offapi/com/sun/star/util/XFlushable.idl4
-rw-r--r--offapi/com/sun/star/util/XImportable.idl4
-rw-r--r--offapi/com/sun/star/util/XIndent.idl2
-rw-r--r--offapi/com/sun/star/util/XJobManager.idl5
-rw-r--r--offapi/com/sun/star/util/XLinkUpdate.idl2
-rw-r--r--offapi/com/sun/star/util/XLocalizedAliases.idl8
-rw-r--r--offapi/com/sun/star/util/XMergeable.idl2
-rw-r--r--offapi/com/sun/star/util/XModeChangeApproveListener.idl8
-rw-r--r--offapi/com/sun/star/util/XModeChangeBroadcaster.idl11
-rw-r--r--offapi/com/sun/star/util/XModeChangeListener.idl4
-rw-r--r--offapi/com/sun/star/util/XModeSelector.idl4
-rw-r--r--offapi/com/sun/star/util/XModifiable.idl4
-rw-r--r--offapi/com/sun/star/util/XModifiable2.idl4
-rw-r--r--offapi/com/sun/star/util/XModifyBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/util/XModifyListener.idl4
-rw-r--r--offapi/com/sun/star/util/XNumberFormatPreviewer.idl11
-rw-r--r--offapi/com/sun/star/util/XNumberFormatTypes.idl5
-rw-r--r--offapi/com/sun/star/util/XNumberFormats.idl8
-rw-r--r--offapi/com/sun/star/util/XNumberFormatsSupplier.idl6
-rw-r--r--offapi/com/sun/star/util/XNumberFormatter.idl11
-rw-r--r--offapi/com/sun/star/util/XOfficeInstallationDirectories.idl2
-rw-r--r--offapi/com/sun/star/util/XPropertyReplace.idl8
-rw-r--r--offapi/com/sun/star/util/XProtectable.idl4
-rw-r--r--offapi/com/sun/star/util/XRefreshListener.idl4
-rw-r--r--offapi/com/sun/star/util/XRefreshable.idl4
-rw-r--r--offapi/com/sun/star/util/XReplaceDescriptor.idl2
-rw-r--r--offapi/com/sun/star/util/XReplaceable.idl6
-rw-r--r--offapi/com/sun/star/util/XSearchDescriptor.idl2
-rw-r--r--offapi/com/sun/star/util/XSearchable.idl6
-rw-r--r--offapi/com/sun/star/util/XSimpleErrorHandler.idl2
-rw-r--r--offapi/com/sun/star/util/XSortable.idl4
-rw-r--r--offapi/com/sun/star/util/XStringAbbreviation.idl2
-rw-r--r--offapi/com/sun/star/util/XStringEscape.idl4
-rw-r--r--offapi/com/sun/star/util/XStringMapping.idl2
-rw-r--r--offapi/com/sun/star/util/XStringSubstitution.idl5
-rw-r--r--offapi/com/sun/star/util/XStringWidth.idl2
-rw-r--r--offapi/com/sun/star/util/XTimeStamped.idl2
-rw-r--r--offapi/com/sun/star/util/XURLTransformer.idl5
-rw-r--r--offapi/com/sun/star/util/XUniqueIDFactory.idl2
-rw-r--r--offapi/com/sun/star/util/XUpdatable.idl5
-rw-r--r--offapi/com/sun/star/view/OfficeDocumentView.idl6
-rw-r--r--offapi/com/sun/star/view/PrintJobEvent.idl5
-rw-r--r--offapi/com/sun/star/view/PrintableStateEvent.idl5
-rw-r--r--offapi/com/sun/star/view/PrinterDescriptor.idl6
-rw-r--r--offapi/com/sun/star/view/RenderDescriptor.idl2
-rw-r--r--offapi/com/sun/star/view/RenderOptions.idl2
-rw-r--r--offapi/com/sun/star/view/ViewSettings.idl2
-rw-r--r--offapi/com/sun/star/view/XControlAccess.idl8
-rw-r--r--offapi/com/sun/star/view/XFormLayerAccess.idl8
-rw-r--r--offapi/com/sun/star/view/XLineCursor.idl2
-rw-r--r--offapi/com/sun/star/view/XMultiSelectionSupplier.idl4
-rw-r--r--offapi/com/sun/star/view/XPrintJob.idl8
-rw-r--r--offapi/com/sun/star/view/XPrintJobBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/view/XPrintJobListener.idl5
-rw-r--r--offapi/com/sun/star/view/XPrintPreview.idl2
-rw-r--r--offapi/com/sun/star/view/XPrintSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/view/XPrintable.idl6
-rw-r--r--offapi/com/sun/star/view/XPrintableBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/view/XPrintableListener.idl7
-rw-r--r--offapi/com/sun/star/view/XRenderable.idl6
-rw-r--r--offapi/com/sun/star/view/XScreenCursor.idl2
-rw-r--r--offapi/com/sun/star/view/XSelectionChangeListener.idl4
-rw-r--r--offapi/com/sun/star/view/XSelectionSupplier.idl6
-rw-r--r--offapi/com/sun/star/view/XViewCursor.idl2
-rw-r--r--offapi/com/sun/star/view/XViewSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/xforms/Binding.idl11
-rw-r--r--offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl2
-rw-r--r--offapi/com/sun/star/xforms/XDataTypeRepository.idl12
-rw-r--r--offapi/com/sun/star/xforms/XFormsSupplier.idl4
-rw-r--r--offapi/com/sun/star/xforms/XFormsUIHelper1.idl25
-rw-r--r--offapi/com/sun/star/xforms/XModel.idl22
-rw-r--r--offapi/com/sun/star/xforms/XSubmission.idl8
-rw-r--r--offapi/com/sun/star/xml/AttributeContainer.idl2
-rw-r--r--offapi/com/sun/star/xml/ExportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/ImportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/NamespaceContainer.idl2
-rw-r--r--offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/XExportFilter.idl3
-rw-r--r--offapi/com/sun/star/xml/XImportFilter.idl3
-rw-r--r--offapi/com/sun/star/xml/XMLExportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/XMLImportFilter.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/SEInitializer.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryption.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignature.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureException.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl3
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryption.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignature.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Decryptor.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Encryptor.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl1
-rw-r--r--offapi/com/sun/star/xml/dom/DOMException.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/DocumentBuilder.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XAttr.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCDATASection.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCharacterData.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XComment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDOMImplementation.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XDocument.idl18
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentBuilder.idl19
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentFragment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentType.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XElement.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XEntity.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XEntityReference.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XNamedNodeMap.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XNode.idl8
-rw-r--r--offapi/com/sun/star/xml/dom/XNodeList.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XNotation.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XProcessingInstruction.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl9
-rw-r--r--offapi/com/sun/star/xml/dom/XText.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/EventException.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/XMutationEvent.idl1
-rw-r--r--offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/FastToken.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/InputSource.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXParseException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XAttributeList.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDTDHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDocumentHandler.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/XEntityResolver.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XErrorHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XFastAttributeList.idl11
-rw-r--r--offapi/com/sun/star/xml/sax/XFastContextHandler.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl12
-rw-r--r--offapi/com/sun/star/xml/sax/XFastParser.idl24
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl11
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSerializer.idl15
-rw-r--r--offapi/com/sun/star/xml/sax/XFastTokenHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XLocator.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XParser.idl18
-rw-r--r--offapi/com/sun/star/xml/sax/XSAXSerializable.idl5
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl2
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathAPI.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathException.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathExtension.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathAPI.idl12
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathExtension.idl4
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathObject.idl8
-rw-r--r--offapi/com/sun/star/xsd/Boolean.idl2
-rw-r--r--offapi/com/sun/star/xsd/Date.idl4
-rw-r--r--offapi/com/sun/star/xsd/DateTime.idl4
-rw-r--r--offapi/com/sun/star/xsd/Day.idl2
-rw-r--r--offapi/com/sun/star/xsd/Decimal.idl2
-rw-r--r--offapi/com/sun/star/xsd/Month.idl2
-rw-r--r--offapi/com/sun/star/xsd/String.idl2
-rw-r--r--offapi/com/sun/star/xsd/Time.idl4
-rw-r--r--offapi/com/sun/star/xsd/XDataType.idl8
-rw-r--r--offapi/com/sun/star/xsd/Year.idl2
2663 files changed, 2 insertions, 16174 deletions
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index 015cd53abf8f..5d850b36f9f8 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
#define __com_sun_star_accessibility_AccessibleEventObject_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index edeca45bce86..602361ba892b 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
#define __com_sun_star_accessibility_AccessibleRelation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index f38bbf9e17ac..cb14fefa5f07 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_AccessibleTableModelChange_idl__
#define __com_sun_star_accessibility_AccessibleTableModelChange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index bdc57865db98..068ac2eef8ba 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
#define __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index a90733f0a13b..ddae52849b99 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
#define __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index d195da413c8a..813af543ef19 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_XAccessible_idl__
#define __com_sun_star_accessibility_XAccessible_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 4d25f9a71ea2..b883b9eccaea 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#define __com_sun_star_accessibility_XAccessibleAction_idl__
-#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
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index 2e1b980fc8d9..cb3dd99f5657 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -28,30 +28,14 @@
#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#define __com_sun_star_accessibility_XAccessibleComponent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XFocusListener_idl__
#include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
#include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 56131a6aa0a4..6ae6a3f9ffc9 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#define __com_sun_star_accessibility_XAccessibleContext_idl__
-#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index 1dc673f4a024..a5ed252c1c70 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
#define __com_sun_star_accessibility_XAccessibleEditableText_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index 0635ad906da4..c769781016ea 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#define __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
index d673d71557b4..29762e0afe5d 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleEventListener_idl__
#define __com_sun_star_accessibility_XAccessibleEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
#include <com/sun/star/accessibility/AccessibleEventObject.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index f7e9168ae881..28a6c69c637f 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -28,30 +28,14 @@
#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#define __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XFocusListener_idl__
#include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
#include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index 464ebff4b838..cde96014532e 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleHyperlink_idl__
#define __com_sun_star_accessibility_XAccessibleHyperlink_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index 1330ebd4a2eb..b27feecd2903 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_accessibility_XAccessibleHypertext_idl__
#define __com_sun_star_accessibility_XAccessibleHypertext_idl__
-#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_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index 7b2dd7a8bbd0..dcda5cc47a3c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
#define __com_sun_star_accessibility_XAccessibleImage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index aecd4702d4b9..ebc87e34fb03 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
#define __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_KeyStroke_idl__
#include <com/sun/star/awt/KeyStroke.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
index c8c8e4c65edc..cfeae5315f82 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
#define __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index 5f1733b52588..d0a7f78dc5db 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_accessibility_XAccessibleRelationSet_idl__
#define __com_sun_star_accessibility_XAccessibleRelationSet_idl__
-#ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
#include <com/sun/star/accessibility/AccessibleRelation.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
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index f0f9cc637184..53e5ad8f0c59 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#define __com_sun_star_accessibility_XAccessibleSelection_idl__
-#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
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index 01b381349621..18b43d0ec852 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleStateSet_idl__
#define __com_sun_star_accessibility_XAccessibleStateSet_idl__
-#ifndef __com_sun_star_accessibility_AccessibleStateType_idl__
#include <com/sun/star/accessibility/AccessibleStateType.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index 07415abe77e3..7c1cdc90bbb6 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#define __com_sun_star_accessibility_XAccessibleTable_idl__
-#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
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index d99fcfeeaddf..788358b9aee5 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -28,31 +28,14 @@
#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#define __com_sun_star_accessibility_XAccessibleText_idl__
-#ifndef __com_sun_star_accessibility_AccessibleTextType_idl__
#include <com/sun/star/accessibility/AccessibleTextType.idl>
-#endif
-
-#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_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
#include <com/sun/star/accessibility/TextSegment.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index 5bb632b0cbc2..ebef4465b2c3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
#define __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
index 5be710265d5e..b5efb67be9d1 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
#define __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.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
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
#include <com/sun/star/accessibility/TextSegment.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index b5d8cb8482ff..c33562f0da75 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#define __com_sun_star_accessibility_XAccessibleValue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/animations/Event.idl b/offapi/com/sun/star/animations/Event.idl
index 297d336978d4..f0d72d97803f 100644
--- a/offapi/com/sun/star/animations/Event.idl
+++ b/offapi/com/sun/star/animations/Event.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_Event_idl__
#define __com_sun_star_animations_Event_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/TargetProperties.idl b/offapi/com/sun/star/animations/TargetProperties.idl
index 3e2133f1c2ae..6bf00285703f 100644
--- a/offapi/com/sun/star/animations/TargetProperties.idl
+++ b/offapi/com/sun/star/animations/TargetProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_TargetProperties_idl__
#define __com_sun_star_animations_TargetProperties_idl__
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimate.idl b/offapi/com/sun/star/animations/XAnimate.idl
index e29359184d25..c7fe1f614762 100644
--- a/offapi/com/sun/star/animations/XAnimate.idl
+++ b/offapi/com/sun/star/animations/XAnimate.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_animations_XAnimate_idl__
#define __com_sun_star_animations_XAnimate_idl__
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_animations_TimeFilterPair_idl__
#include <com/sun/star/animations/TimeFilterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimateColor.idl b/offapi/com/sun/star/animations/XAnimateColor.idl
index f57b07082acd..cbeb2b5e217e 100644
--- a/offapi/com/sun/star/animations/XAnimateColor.idl
+++ b/offapi/com/sun/star/animations/XAnimateColor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAnimateColor_idl__
#define __com_sun_star_animations_XAnimateColor_idl__
-#ifndef __com_sun_star_animations_XAnimate_idl__
#include <com/sun/star/animations/XAnimate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimateMotion.idl b/offapi/com/sun/star/animations/XAnimateMotion.idl
index ea9a71a7a469..e50dc934512f 100644
--- a/offapi/com/sun/star/animations/XAnimateMotion.idl
+++ b/offapi/com/sun/star/animations/XAnimateMotion.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAnimateMotion_idl__
#define __com_sun_star_animations_XAnimateMotion_idl__
-#ifndef __com_sun_star_animations_XAnimate_idl__
#include <com/sun/star/animations/XAnimate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimateSet.idl b/offapi/com/sun/star/animations/XAnimateSet.idl
index 1f363f42c62b..a0a8d05b4e49 100644
--- a/offapi/com/sun/star/animations/XAnimateSet.idl
+++ b/offapi/com/sun/star/animations/XAnimateSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAnimateSet_idl__
#define __com_sun_star_animations_XAnimateSet_idl__
-#ifndef __com_sun_star_animations_XAnimate_idl__
#include <com/sun/star/animations/XAnimate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimateTransform.idl b/offapi/com/sun/star/animations/XAnimateTransform.idl
index 2bdd61cc8cdb..4791460f0a62 100644
--- a/offapi/com/sun/star/animations/XAnimateTransform.idl
+++ b/offapi/com/sun/star/animations/XAnimateTransform.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAnimateTransform_idl__
#define __com_sun_star_animations_XAnimateTransform_idl__
-#ifndef __com_sun_star_animations_XAnimate_idl__
#include <com/sun/star/animations/XAnimate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl
index d1f4f453ee60..cbbea2200625 100644
--- a/offapi/com/sun/star/animations/XAnimationListener.idl
+++ b/offapi/com/sun/star/animations/XAnimationListener.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_animations_XAnimationListener_idl__
#define __com_sun_star_animations_XAnimationListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl
index f2d5d859ce5f..2cec5a0cffa4 100644
--- a/offapi/com/sun/star/animations/XAnimationNode.idl
+++ b/offapi/com/sun/star/animations/XAnimationNode.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_animations_XAnimationNode_idl__
#define __com_sun_star_animations_XAnimationNode_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
index d7be5b71b05d..d633155829d0 100644
--- a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
+++ b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAnimationNodeSupplier_idl__
#define __com_sun_star_animations_XAnimationNodeSupplier_idl__
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XAudio.idl b/offapi/com/sun/star/animations/XAudio.idl
index 9a5c253132da..3098f4ce3454 100644
--- a/offapi/com/sun/star/animations/XAudio.idl
+++ b/offapi/com/sun/star/animations/XAudio.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XAudio_idl__
#define __com_sun_star_animations_XAudio_idl__
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XCommand.idl b/offapi/com/sun/star/animations/XCommand.idl
index d183476d44a1..83f667b66634 100644
--- a/offapi/com/sun/star/animations/XCommand.idl
+++ b/offapi/com/sun/star/animations/XCommand.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XCommand_idl__
#define __com_sun_star_animations_XCommand_idl__
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XIterateContainer.idl b/offapi/com/sun/star/animations/XIterateContainer.idl
index 310ce04ded76..6a75e5babf17 100644
--- a/offapi/com/sun/star/animations/XIterateContainer.idl
+++ b/offapi/com/sun/star/animations/XIterateContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XIterateContainer_idl__
#define __com_sun_star_animations_XIterateContainer_idl__
-#ifndef __com_sun_star_animations_XTimeContainer_idl__
#include <com/sun/star/animations/XTimeContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index 13d726833b63..016bf2b94d8a 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_animations_XTargetPropertiesCreator_idl__
#define __com_sun_star_animations_XTargetPropertiesCreator_idl__
-#ifndef __com_sun_star_animations_TargetProperties_idl__
#include <com/sun/star/animations/TargetProperties.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XTimeContainer.idl b/offapi/com/sun/star/animations/XTimeContainer.idl
index 2fa1681706f7..897af862b10a 100644
--- a/offapi/com/sun/star/animations/XTimeContainer.idl
+++ b/offapi/com/sun/star/animations/XTimeContainer.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_animations_XTimeContainer_idl__
#define __com_sun_star_animations_XTimeContainer_idl__
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/animations/XTransitionFilter.idl b/offapi/com/sun/star/animations/XTransitionFilter.idl
index 1a6eec80f382..651bb4ad7c7a 100644
--- a/offapi/com/sun/star/animations/XTransitionFilter.idl
+++ b/offapi/com/sun/star/animations/XTransitionFilter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_animations_XTransitionFilter_idl__
#define __com_sun_star_animations_XTransitionFilter_idl__
-#ifndef __com_sun_star_animations_XAnimate_idl__
#include <com/sun/star/animations/XAnimate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/auth/AuthenticationFailedException.idl b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
index 6d0abbaa97d1..64afa3aaf03b 100644
--- a/offapi/com/sun/star/auth/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
#define __com_sun_star_auth_AuthenticationFailedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/InvalidArgumentException.idl b/offapi/com/sun/star/auth/InvalidArgumentException.idl
index 115eab5b6337..28e63a7c42ea 100644
--- a/offapi/com/sun/star/auth/InvalidArgumentException.idl
+++ b/offapi/com/sun/star/auth/InvalidArgumentException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
#define __com_sun_star_auth_InvalidArgumentException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/InvalidContextException.idl b/offapi/com/sun/star/auth/InvalidContextException.idl
index 28e9bba9b0dd..fad19432f408 100644
--- a/offapi/com/sun/star/auth/InvalidContextException.idl
+++ b/offapi/com/sun/star/auth/InvalidContextException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_InvalidContextException_idl__
#define __com_sun_star_auth_InvalidContextException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/InvalidCredentialException.idl b/offapi/com/sun/star/auth/InvalidCredentialException.idl
index 3caed7fd1dec..b09c79114eaf 100644
--- a/offapi/com/sun/star/auth/InvalidCredentialException.idl
+++ b/offapi/com/sun/star/auth/InvalidCredentialException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_InvalidCredentialException_idl__
#define __com_sun_star_auth_InvalidCredentialException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/InvalidPrincipalException.idl b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
index 6b98b9b86e47..00f7ea81b1c5 100644
--- a/offapi/com/sun/star/auth/InvalidPrincipalException.idl
+++ b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
#define __com_sun_star_auth_InvalidPrincipalException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/PersistenceFailureException.idl b/offapi/com/sun/star/auth/PersistenceFailureException.idl
index 7ef1864327d1..9bf5288c844b 100644
--- a/offapi/com/sun/star/auth/PersistenceFailureException.idl
+++ b/offapi/com/sun/star/auth/PersistenceFailureException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_PersistenceFailureException_idl__
#define __com_sun_star_auth_PersistenceFailureException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl b/offapi/com/sun/star/auth/SSOExceptions.idl
index 4e4bbe293ecb..90bfc258844a 100644
--- a/offapi/com/sun/star/auth/SSOExceptions.idl
+++ b/offapi/com/sun/star/auth/SSOExceptions.idl
@@ -28,26 +28,12 @@
#ifndef __com_sun_star_auth_SSOExceptions_idl__
#define __com_sun_star_auth_SSOExceptions_idl__
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
#include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
#include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidContextException_idl__
#include <com/sun/star/auth/InvalidContextException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidCredentialException_idl__
#include <com/sun/star/auth/InvalidCredentialException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
#include <com/sun/star/auth/InvalidPrincipalException.idl>
-#endif
-#ifndef __com_sun_star_auth_PersistenceFailureException_idl__
#include <com/sun/star/auth/PersistenceFailureException.idl>
-#endif
-#ifndef __com_sun_star_auth_UnsupportedException_idl__
#include <com/sun/star/auth/UnsupportedException.idl>
-#endif
#endif
diff --git a/offapi/com/sun/star/auth/SSOManagerFactory.idl b/offapi/com/sun/star/auth/SSOManagerFactory.idl
index e172649bcac9..89d3cb2193f7 100644
--- a/offapi/com/sun/star/auth/SSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/SSOManagerFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_SSOManagerFactory_idl__
#define __com_sun_star_auth_SSOManagerFactory_idl__
-#ifndef __com_sun_star_auth_XSSOManagerFactory_idl_
#include <com/sun/star/auth/XSSOManagerFactory.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/SSOPasswordCache.idl b/offapi/com/sun/star/auth/SSOPasswordCache.idl
index 1e47c134e912..3ccee3623550 100644
--- a/offapi/com/sun/star/auth/SSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/SSOPasswordCache.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_SSOPasswordCache_idl__
#define __com_sun_star_auth_SSOPasswordCache_idl__
-#ifndef __com_sun_star_auth_XSSOPasswordCache_idl_
#include <com/sun/star/auth/XSSOPasswordCache.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/UnsupportedException.idl b/offapi/com/sun/star/auth/UnsupportedException.idl
index a2c14079714d..3e6c30d51adb 100644
--- a/offapi/com/sun/star/auth/UnsupportedException.idl
+++ b/offapi/com/sun/star/auth/UnsupportedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_UnsupportedException_idl__
#define __com_sun_star_auth_UnsupportedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
index d430f586adb8..8c6a1c4043e3 100644
--- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
#define __com_sun_star_auth_XSSOAcceptorContext_idl__
-#ifndef __com_sun_star_auth_XSSOContext_idl__
#include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
#include <com/sun/star/auth/SSOExceptions.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOContext.idl b/offapi/com/sun/star/auth/XSSOContext.idl
index ce47d6cd1a6f..fe42e843c1ca 100644
--- a/offapi/com/sun/star/auth/XSSOContext.idl
+++ b/offapi/com/sun/star/auth/XSSOContext.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_auth_XSSOContext_idl__
#define __com_sun_star_auth_XSSOContext_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
index 27b7cf672a92..3b03ade0578c 100644
--- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
#define __com_sun_star_auth_XSSOInitiatorContext_idl__
-#ifndef __com_sun_star_auth_XSSOContext_idl__
#include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
#include <com/sun/star/auth/SSOExceptions.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl
index 5d47e19ad0b7..8db6933eb24b 100644
--- a/offapi/com/sun/star/auth/XSSOManager.idl
+++ b/offapi/com/sun/star/auth/XSSOManager.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_auth_XSSOManager_idl__
#define __com_sun_star_auth_XSSOManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
#include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
#include <com/sun/star/auth/SSOExceptions.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
#include <com/sun/star/auth/XSSOAcceptorContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
#include <com/sun/star/auth/XSSOInitiatorContext.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOManagerFactory.idl b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
index 400bc1c075a6..e8746b868ebc 100644
--- a/offapi/com/sun/star/auth/XSSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_auth_XSSOManagerFactory_idl__
#define __com_sun_star_auth_XSSOManagerFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOManager_idl__
#include <com/sun/star/auth/XSSOManager.idl>
-#endif
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOPasswordCache.idl b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
index f06718923dbd..81edf48a9b0d 100644
--- a/offapi/com/sun/star/auth/XSSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_auth_XSSOPasswordCache_idl__
#define __com_sun_star_auth_XSSOPasswordCache_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
#include <com/sun/star/auth/SSOExceptions.idl>
-#endif
module com { module sun { module star { module auth {
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
//=============================================================================
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index 82f4d48daadb..6fc8e70295f5 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_chart_AccessibleChartDocumentView_idl__
#define __com_sun_star_chart_AccessibleChartDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index ffca123251ad..6670e495bb9b 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_chart_AccessibleChartElement_idl__
#define __com_sun_star_chart_AccessibleChartElement_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/AreaDiagram.idl b/offapi/com/sun/star/chart/AreaDiagram.idl
index 19f3cee7ce1d..b21a7907ffc2 100644
--- a/offapi/com/sun/star/chart/AreaDiagram.idl
+++ b/offapi/com/sun/star/chart/AreaDiagram.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_chart_AreaDiagram_idl__
#define __com_sun_star_chart_AreaDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
#include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/BarDiagram.idl b/offapi/com/sun/star/chart/BarDiagram.idl
index 7040781e9c50..8a818bf018c8 100644
--- a/offapi/com/sun/star/chart/BarDiagram.idl
+++ b/offapi/com/sun/star/chart/BarDiagram.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_chart_BarDiagram_idl__
#define __com_sun_star_chart_BarDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
#include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/BubbleDiagram.idl b/offapi/com/sun/star/chart/BubbleDiagram.idl
index 99298ed947d7..a3dccac9e6df 100644
--- a/offapi/com/sun/star/chart/BubbleDiagram.idl
+++ b/offapi/com/sun/star/chart/BubbleDiagram.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_chart_BubbleDiagram_idl__
#define __com_sun_star_chart_BubbleDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/Chart3DBarProperties.idl b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
index 31b77e446bf9..82418c6ed8c8 100644
--- a/offapi/com/sun/star/chart/Chart3DBarProperties.idl
+++ b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_Chart3DBarProperties_idl__
#define __com_sun_star_chart_Chart3DBarProperties_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartArea.idl b/offapi/com/sun/star/chart/ChartArea.idl
index 66109be78471..ce5c8b633d38 100644
--- a/offapi/com/sun/star/chart/ChartArea.idl
+++ b/offapi/com/sun/star/chart/ChartArea.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_chart_ChartArea_idl__
#define __com_sun_star_chart_ChartArea_idl__
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index ed338645fb03..76867ecc6b95 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -27,49 +27,20 @@
#ifndef __com_sun_star_chart_ChartAxis_idl__
#define __com_sun_star_chart_ChartAxis_idl__
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__
#include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisPosition_idl__
#include <com/sun/star/chart/ChartAxisPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__
#include <com/sun/star/chart/ChartAxisLabelPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__
#include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisType_idl__
#include <com/sun/star/chart/ChartAxisType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_TimeIncrement_idl__
#include <com/sun/star/chart/TimeIncrement.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XAxis_idl__
#include <com/sun/star/chart/XAxis.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
index c59a3988a866..b814d0451470 100644
--- a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#define __com_sun_star_chart_ChartAxisXSupplier_idl__
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
#include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
index aa33daad6031..527c322df5ea 100644
--- a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
#define __com_sun_star_chart_ChartAxisYSupplier_idl__
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
#include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
index 3e18709c0319..13a22ef31a05 100644
--- a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
#define __com_sun_star_chart_ChartAxisZSupplier_idl__
-#ifndef __com_sun_star_chart_XAxisZSupplier_idl__
#include <com/sun/star/chart/XAxisZSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartData.idl b/offapi/com/sun/star/chart/ChartData.idl
index ec5efcbe8db6..a6d9d04c9e9d 100644
--- a/offapi/com/sun/star/chart/ChartData.idl
+++ b/offapi/com/sun/star/chart/ChartData.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartData_idl__
#define __com_sun_star_chart_ChartData_idl__
-#ifndef __com_sun_star_chart_XChartData_idl__
#include <com/sun/star/chart/XChartData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataArray.idl b/offapi/com/sun/star/chart/ChartDataArray.idl
index da4e2564f5c9..5490c423361f 100644
--- a/offapi/com/sun/star/chart/ChartDataArray.idl
+++ b/offapi/com/sun/star/chart/ChartDataArray.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_ChartDataArray_idl__
#define __com_sun_star_chart_ChartDataArray_idl__
-#ifndef __com_sun_star_chart_ChartData_idl__
#include <com/sun/star/chart/ChartData.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartData_idl__
#include <com/sun/star/chart/XChartData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
index bca4a7b565fd..a6288be21d5a 100644
--- a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
+++ b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
#define __com_sun_star_chart_ChartDataChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartDataChangeType_idl__
#include <com/sun/star/chart/ChartDataChangeType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataPoint.idl b/offapi/com/sun/star/chart/ChartDataPoint.idl
index 3494ae1f3853..5c8545d82757 100644
--- a/offapi/com/sun/star/chart/ChartDataPoint.idl
+++ b/offapi/com/sun/star/chart/ChartDataPoint.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartDataPoint_idl__
#define __com_sun_star_chart_ChartDataPoint_idl__
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
#include <com/sun/star/chart/ChartDataValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataPointProperties.idl b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
index 77f875841483..c648852cd81c 100644
--- a/offapi/com/sun/star/chart/ChartDataPointProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
#define __com_sun_star_chart_ChartDataPointProperties_idl__
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_chart_Chart3DBarProperties_idl__
#include <com/sun/star/chart/Chart3DBarProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataRow.idl b/offapi/com/sun/star/chart/ChartDataRow.idl
index 05f2002d60c8..d4fb2f24a26a 100644
--- a/offapi/com/sun/star/chart/ChartDataRow.idl
+++ b/offapi/com/sun/star/chart/ChartDataRow.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartDataRow_idl__
#define __com_sun_star_chart_ChartDataRow_idl__
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
#include <com/sun/star/chart/ChartDataValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataRowProperties.idl b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
index 27a02f598c3e..1bb1faf5c88e 100644
--- a/offapi/com/sun/star/chart/ChartDataRowProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_chart_ChartDataRowProperties_idl__
#define __com_sun_star_chart_ChartDataRowProperties_idl__
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
#include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDocument.idl b/offapi/com/sun/star/chart/ChartDocument.idl
index 2c5227329778..5de20f5a0b59 100644
--- a/offapi/com/sun/star/chart/ChartDocument.idl
+++ b/offapi/com/sun/star/chart/ChartDocument.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_chart_ChartDocument_idl__
#define __com_sun_star_chart_ChartDocument_idl__
-#ifndef __com_sun_star_chart_XChartDocument_idl__
#include <com/sun/star/chart/XChartDocument.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
-
#include <com/sun/star/drawing/XDrawPageSupplier.idl>
-
//=============================================================================
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/ChartGrid.idl b/offapi/com/sun/star/chart/ChartGrid.idl
index b4c6f6001e13..db391a7f98c0 100644
--- a/offapi/com/sun/star/chart/ChartGrid.idl
+++ b/offapi/com/sun/star/chart/ChartGrid.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_ChartGrid_idl__
#define __com_sun_star_chart_ChartGrid_idl__
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index a0fcf587c7ef..c16ec6774411 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_chart_ChartLegend_idl__
#define __com_sun_star_chart_ChartLegend_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartLegendPosition_idl__
#include <com/sun/star/chart/ChartLegendPosition.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartLine.idl b/offapi/com/sun/star/chart/ChartLine.idl
index e9ae401edc11..fcb3e051d713 100644
--- a/offapi/com/sun/star/chart/ChartLine.idl
+++ b/offapi/com/sun/star/chart/ChartLine.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_ChartLine_idl__
#define __com_sun_star_chart_ChartLine_idl__
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
index b771d59e4c8d..7a123199999c 100644
--- a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
+++ b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_ChartPieSegmentProperties_idl__
#define __com_sun_star_chart_ChartPieSegmentProperties_idl__
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
#include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartStatistics.idl b/offapi/com/sun/star/chart/ChartStatistics.idl
index 57c373eaf968..695c942bbd2d 100644
--- a/offapi/com/sun/star/chart/ChartStatistics.idl
+++ b/offapi/com/sun/star/chart/ChartStatistics.idl
@@ -27,22 +27,10 @@
#ifndef __com_sun_star_chart_ChartStatistics_idl__
#define __com_sun_star_chart_ChartStatistics_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorCategory_idl__
#include <com/sun/star/chart/ChartErrorCategory.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__
#include <com/sun/star/chart/ChartErrorIndicatorType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__
#include <com/sun/star/chart/ChartRegressionCurveType.idl>
-#endif
-
#include <com/sun/star/chart/ErrorBarStyle.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
index a9f72f0824cc..34fdcbff3f2f 100644
--- a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_ChartTableAddressSupplier_idl__
#define __com_sun_star_chart_ChartTableAddressSupplier_idl__
-#ifndef __com_sun_star_chart_ChartSeriesAddress_idl__
#include <com/sun/star/chart/ChartSeriesAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index cf94f8933eda..e0ac92fa2645 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_chart_ChartTitle_idl__
#define __com_sun_star_chart_ChartTitle_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
index 66e1970da564..96b1f7091e65 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
#define __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
-#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
#include <com/sun/star/chart/XTwoAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
index cba1dfd64b32..a251105e6188 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#define __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
#include <com/sun/star/chart/XTwoAxisYSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index 854baadb38cc..26fc9523712c 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_chart_Diagram_idl__
#define __com_sun_star_chart_Diagram_idl__
-#ifndef __com_sun_star_chart_XDiagram_idl__
#include <com/sun/star/chart/XDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XAxisSupplier_idl__
#include <com/sun/star/chart/XAxisSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XDiagramPositioning_idl__
#include <com/sun/star/chart/XDiagramPositioning.idl>
-#endif
-#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
#include <com/sun/star/chart/XSecondAxisTitleSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartDataRowSource_idl__
#include <com/sun/star/chart/ChartDataRowSource.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/Dim3DDiagram.idl b/offapi/com/sun/star/chart/Dim3DDiagram.idl
index 26006c801f8d..83d0783290cd 100644
--- a/offapi/com/sun/star/chart/Dim3DDiagram.idl
+++ b/offapi/com/sun/star/chart/Dim3DDiagram.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
#define __com_sun_star_chart_Dim3DDiagram_idl__
-#ifndef __com_sun_star_chart_X3DDisplay_idl__
#include <com/sun/star/chart/X3DDisplay.idl>
-#endif
-#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
#include <com/sun/star/chart/X3DDefaultSetter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/DonutDiagram.idl b/offapi/com/sun/star/chart/DonutDiagram.idl
index ff041f4561e0..b99aeaab58fc 100644
--- a/offapi/com/sun/star/chart/DonutDiagram.idl
+++ b/offapi/com/sun/star/chart/DonutDiagram.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_DonutDiagram_idl__
#define __com_sun_star_chart_DonutDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
index bb6682ad4688..e930d649f3f4 100644
--- a/offapi/com/sun/star/chart/FilledNetDiagram.idl
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_chart_FilledNetDiagram_idl__
#define __com_sun_star_chart_FilledNetDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/LineDiagram.idl b/offapi/com/sun/star/chart/LineDiagram.idl
index b9a118238486..e6134c130655 100644
--- a/offapi/com/sun/star/chart/LineDiagram.idl
+++ b/offapi/com/sun/star/chart/LineDiagram.idl
@@ -27,37 +27,20 @@
#ifndef __com_sun_star_chart_LineDiagram_idl__
#define __com_sun_star_chart_LineDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
#include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/NetDiagram.idl b/offapi/com/sun/star/chart/NetDiagram.idl
index 328e33b50c69..4c69cd7cb004 100644
--- a/offapi/com/sun/star/chart/NetDiagram.idl
+++ b/offapi/com/sun/star/chart/NetDiagram.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_NetDiagram_idl__
#define __com_sun_star_chart_NetDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/PieDiagram.idl b/offapi/com/sun/star/chart/PieDiagram.idl
index 54010971d450..424ea795031c 100644
--- a/offapi/com/sun/star/chart/PieDiagram.idl
+++ b/offapi/com/sun/star/chart/PieDiagram.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_PieDiagram_idl__
#define __com_sun_star_chart_PieDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/StockDiagram.idl b/offapi/com/sun/star/chart/StockDiagram.idl
index 9d960468b17b..17e424494a09 100644
--- a/offapi/com/sun/star/chart/StockDiagram.idl
+++ b/offapi/com/sun/star/chart/StockDiagram.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_chart_StockDiagram_idl__
#define __com_sun_star_chart_StockDiagram_idl__
-#ifndef __com_sun_star_chart_XStatisticDisplay_idl__
#include <com/sun/star/chart/XStatisticDisplay.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/X3DDefaultSetter.idl b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
index 35a62e3ccdaa..787b7bd92aff 100644
--- a/offapi/com/sun/star/chart/X3DDefaultSetter.idl
+++ b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
#define __com_sun_star_chart_X3DDefaultSetter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/X3DDisplay.idl b/offapi/com/sun/star/chart/X3DDisplay.idl
index f117ccc7b4af..7c9c27646477 100644
--- a/offapi/com/sun/star/chart/X3DDisplay.idl
+++ b/offapi/com/sun/star/chart/X3DDisplay.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_X3DDisplay_idl__
#define __com_sun_star_chart_X3DDisplay_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxis.idl b/offapi/com/sun/star/chart/XAxis.idl
index 763e2f45412b..0cd75f65459c 100644
--- a/offapi/com/sun/star/chart/XAxis.idl
+++ b/offapi/com/sun/star/chart/XAxis.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart_XAxis_idl
#define com_sun_star_chart_XAxis_idl
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl b/offapi/com/sun/star/chart/XAxisSupplier.idl
index cf2bde2e310d..f87d2453ddce 100644
--- a/offapi/com/sun/star/chart/XAxisSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisSupplier.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart_XAxisSupplier_idl
#define com_sun_star_chart_XAxisSupplier_idl
-#ifndef __com_sun_star_chart_XAxis_idl__
#include <com/sun/star/chart/XAxis.idl>
-#endif
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/XAxisXSupplier.idl b/offapi/com/sun/star/chart/XAxisXSupplier.idl
index 5a66136d25f0..21a934bf6265 100644
--- a/offapi/com/sun/star/chart/XAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisXSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
#define __com_sun_star_chart_XAxisXSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxisYSupplier.idl b/offapi/com/sun/star/chart/XAxisYSupplier.idl
index a84562415948..4ad491ee82db 100644
--- a/offapi/com/sun/star/chart/XAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisYSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
#define __com_sun_star_chart_XAxisYSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxisZSupplier.idl b/offapi/com/sun/star/chart/XAxisZSupplier.idl
index 220aef76afb2..79e4b6816b3a 100644
--- a/offapi/com/sun/star/chart/XAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisZSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_XAxisZSupplier_idl__
#define __com_sun_star_chart_XAxisZSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartData.idl b/offapi/com/sun/star/chart/XChartData.idl
index 4bcb4b199704..9aecb429e00a 100644
--- a/offapi/com/sun/star/chart/XChartData.idl
+++ b/offapi/com/sun/star/chart/XChartData.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_XChartData_idl__
#define __com_sun_star_chart_XChartData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
#include <com/sun/star/chart/XChartDataChangeEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartDataArray.idl b/offapi/com/sun/star/chart/XChartDataArray.idl
index 4e7519864382..1de92ba82891 100644
--- a/offapi/com/sun/star/chart/XChartDataArray.idl
+++ b/offapi/com/sun/star/chart/XChartDataArray.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_XChartDataArray_idl__
#define __com_sun_star_chart_XChartDataArray_idl__
-#ifndef __com_sun_star_chart_XChartData_idl__
#include <com/sun/star/chart/XChartData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
index 13b6145a452f..57be96cddbbb 100644
--- a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
+++ b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
#define __com_sun_star_chart_XChartDataChangeEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
#include <com/sun/star/chart/ChartDataChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartDocument.idl b/offapi/com/sun/star/chart/XChartDocument.idl
index 1ffd268be59d..bb3d871cc8a0 100644
--- a/offapi/com/sun/star/chart/XChartDocument.idl
+++ b/offapi/com/sun/star/chart/XChartDocument.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_chart_XChartDocument_idl__
#define __com_sun_star_chart_XChartDocument_idl__
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_chart_XDiagram_idl__
#include <com/sun/star/chart/XDiagram.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartData_idl__
#include <com/sun/star/chart/XChartData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
index 4e5af5f3ba83..680080c296be 100644
--- a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__
#define __com_sun_star_chart_XComplexDescriptionAccess_idl__
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XDiagram.idl b/offapi/com/sun/star/chart/XDiagram.idl
index 959ec6ce9dcd..ee3fc65edd29 100644
--- a/offapi/com/sun/star/chart/XDiagram.idl
+++ b/offapi/com/sun/star/chart/XDiagram.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_chart_XDiagram_idl__
#define __com_sun_star_chart_XDiagram_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XDiagramPositioning.idl b/offapi/com/sun/star/chart/XDiagramPositioning.idl
index 95dd832b42e6..b5e869a91401 100644
--- a/offapi/com/sun/star/chart/XDiagramPositioning.idl
+++ b/offapi/com/sun/star/chart/XDiagramPositioning.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_chart_XDiagramPositioning_idl__
#define __com_sun_star_chart_XDiagramPositioning_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/chart/XSecondAxisTitleSupplier.idl b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
index 9f1009e3381a..527f58e2f735 100644
--- a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
+++ b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
@@ -1,13 +1,8 @@
#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
#define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
module com { module sun { module star { module chart {
diff --git a/offapi/com/sun/star/chart/XStatisticDisplay.idl b/offapi/com/sun/star/chart/XStatisticDisplay.idl
index a81038ab0c6d..094f4d480bab 100644
--- a/offapi/com/sun/star/chart/XStatisticDisplay.idl
+++ b/offapi/com/sun/star/chart/XStatisticDisplay.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_XStatisticDisplay_idl__
#define __com_sun_star_chart_XStatisticDisplay_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
index 2fbbf8f6cbf5..831f911f2a04 100644
--- a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
#define __com_sun_star_chart_XTwoAxisXSupplier_idl__
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
#include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
index 01c8839df463..530363735d2e 100644
--- a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
#define __com_sun_star_chart_XTwoAxisYSupplier_idl__
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
#include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart/XYDiagram.idl b/offapi/com/sun/star/chart/XYDiagram.idl
index 501608669f0c..423e7aadb072 100644
--- a/offapi/com/sun/star/chart/XYDiagram.idl
+++ b/offapi/com/sun/star/chart/XYDiagram.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_chart_XYDiagram_idl__
#define __com_sun_star_chart_XYDiagram_idl__
-#ifndef __com_sun_star_chart_Diagram_idl__
#include <com/sun/star/chart/Diagram.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-#ifndef __com_sun_star_chart_LineDiagram_idl__
#include <com/sun/star/chart/LineDiagram.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index e952d446e80d..d5daba1232b8 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -28,15 +28,12 @@
#define com_sun_star_chart_Axis_idl
#include <com/sun/star/beans/PropertySet.idl>
-
#include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
#include <com/sun/star/chart/ChartAxisPosition.idl>
#include <com/sun/star/chart/ChartAxisLabelPosition.idl>
#include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-
#include <com/sun/star/chart2/XAxis.idl>
#include <com/sun/star/chart2/XTitled.idl>
-
#include <com/sun/star/drawing/LineProperties.idl>
#include <com/sun/star/style/CharacterProperties.idl>
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index c4927d8297be..56a04ed33522 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -29,11 +29,9 @@
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-
#include <com/sun/star/chart2/XChartDocument.idl>
#include <com/sun/star/chart2/XUndoSupplier.idl>
#include <com/sun/star/chart2/data/XDataReceiver.idl>
-
#include <com/sun/star/chart2/XTitled.idl>
#include <com/sun/star/lang/XInitialization.idl>
diff --git a/offapi/com/sun/star/chart2/ChartType.idl b/offapi/com/sun/star/chart2/ChartType.idl
index 266ab33fc8d2..e88abbeb9d5d 100644
--- a/offapi/com/sun/star/chart2/ChartType.idl
+++ b/offapi/com/sun/star/chart2/ChartType.idl
@@ -28,7 +28,6 @@
#define com_sun_star_chart2_ChartType_idl
#include <com/sun/star/beans/XPropertySet.idl>
-
#include <com/sun/star/chart2/XChartType.idl>
#include <com/sun/star/chart2/XDataSeriesContainer.idl>
diff --git a/offapi/com/sun/star/chart2/CoordinateSystem.idl b/offapi/com/sun/star/chart2/CoordinateSystem.idl
index 17db847c8353..b74aace0e7d9 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystem.idl
@@ -1,21 +1,10 @@
#ifndef com_sun_star_chart2_CoordinateSystem_idl
#define com_sun_star_chart2_CoordinateSystem_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XScale_idl
#include <com/sun/star/chart2/XScale.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl
index 9278ffb3566c..5f070bd0b857 100644
--- a/offapi/com/sun/star/chart2/DataPoint.idl
+++ b/offapi/com/sun/star/chart2/DataPoint.idl
@@ -28,7 +28,6 @@
#define com_sun_star_chart2_DataPoint_idl
#include <com/sun/star/style/CharacterProperties.idl>
-
#include <com/sun/star/style/XStyle.idl>
module com
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index c5437e87d777..4893449a2ce8 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -28,12 +28,10 @@
#define com_sun_star_chart2_DataPointProperties_idl
#include <com/sun/star/beans/PropertySet.idl>
-
#include <com/sun/star/awt/Gradient.idl>
#include <com/sun/star/drawing/Hatch.idl>
#include <com/sun/star/drawing/LineDash.idl>
#include <com/sun/star/style/XStyle.idl>
-
#include <com/sun/star/chart2/BitmapProperty.idl>
#include <com/sun/star/chart2/TransparencyStyle.idl>
#include <com/sun/star/chart2/DataCaptionStyle.idl>
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index 580c036c49eb..61b0d795babb 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -31,7 +31,6 @@
#include <com/sun/star/container/XIndexContainer.idl>
#include <com/sun/star/container/XContainer.idl>
#include <com/sun/star/style/XStyle.idl>
-
#include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
#include <com/sun/star/chart2/data/XDataSink.idl>
#include <com/sun/star/chart2/data/XDataSource.idl>
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 8abd1fa3110c..e13d609523f0 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -27,10 +27,7 @@
#ifndef com_sun_star_chart_Diagram_idl
#define com_sun_star_chart_Diagram_idl
-#ifndef com_sun_star_chart2_XDiagram_idl__
#include <com/sun/star/chart2/XDiagram.idl>
-#endif
-
#include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
#include <com/sun/star/chart2/XTitled.idl>
#include <com/sun/star/chart2/RelativePosition.idl>
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index 95fd88853c71..eacf3e1e48ce 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_ExponentialScaling_idl
#define com_sun_star_chart2_ExponentialScaling_idl
-#ifndef com_sun_star_chart2_XScaling_idl
#include <com/sun/star/chart2/XScaling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/FillBitmap.idl b/offapi/com/sun/star/chart2/FillBitmap.idl
index 52b0d388807e..46de06115b68 100644
--- a/offapi/com/sun/star/chart2/FillBitmap.idl
+++ b/offapi/com/sun/star/chart2/FillBitmap.idl
@@ -27,19 +27,10 @@
#ifndef com_sun_star_chart2_FillBitmap_idl
#define com_sun_star_chart2_FillBitmap_idl
-#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_drawing_BitmapMode_idl__
#include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
#include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
module com
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 5c9c094adc5d..1916425e58b3 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -1,15 +1,11 @@
#ifndef com_sun_star_chart_XFormattedString_idl
#define com_sun_star_chart_XFormattedString_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/beans/PropertySet.idl>
#include <com/sun/star/style/CharacterProperties.idl>
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-
#include <com/sun/star/chart2/XFormattedString.idl>
module com
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index e1b82c07d5a6..dfa769b54761 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -28,9 +28,7 @@
#define com_sun_star_chart_GridProperties_idl
#include <com/sun/star/beans/XPropertySet.idl>
-
#include <com/sun/star/chart2/XGrid.idl>
-
#include <com/sun/star/drawing/LineProperties.idl>
module com
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 0285f014fd0b..6a7317448410 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -30,7 +30,6 @@
#include <com/sun/star/chart2/XLegend.idl>
#include <com/sun/star/chart2/LegendPosition.idl>
#include <com/sun/star/chart/ChartLegendExpansion.idl>
-
#include <com/sun/star/beans/PropertySet.idl>
#include <com/sun/star/drawing/LineProperties.idl>
#include <com/sun/star/drawing/FillProperties.idl>
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index 6d1b4c90aa38..a933192a558d 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_LinearScaling_idl
#define com_sun_star_chart2_LinearScaling_idl
-#ifndef com_sun_star_chart2_XScaling_idl
#include <com/sun/star/chart2/XScaling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index 0c6c2eedba26..231ed2865d86 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_LogarithmicScaling_idl
#define com_sun_star_chart2_LogarithmicScaling_idl
-#ifndef com_sun_star_chart2_XScaling_idl
#include <com/sun/star/chart2/XScaling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index 1d82f2a8f951..f141bb8c972a 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_PowerScaling_idl
#define com_sun_star_chart2_PowerScaling_idl
-#ifndef com_sun_star_chart2_XScaling_idl
#include <com/sun/star/chart2/XScaling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/RelativePosition.idl b/offapi/com/sun/star/chart2/RelativePosition.idl
index 5eb92916585c..c940ab0838f5 100644
--- a/offapi/com/sun/star/chart2/RelativePosition.idl
+++ b/offapi/com/sun/star/chart2/RelativePosition.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_RelativePosition_idl
#define com_sun_star_chart2_RelativePosition_idl
-#ifndef __com_sun_star_drawing_Alignment_idl__
#include <com/sun/star/drawing/Alignment.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/Scaling.idl b/offapi/com/sun/star/chart2/Scaling.idl
index 47b554dbc72e..3ca475cd5f04 100644
--- a/offapi/com/sun/star/chart2/Scaling.idl
+++ b/offapi/com/sun/star/chart2/Scaling.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart2_Scaling_idl
#define com_sun_star_chart2_Scaling_idl
-#ifndef com_sun_star_chart2_XScaling_idl
#include <com/sun/star/chart2/XScaling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index 6733715f1703..036f8555be71 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -27,9 +27,7 @@
#ifndef com_sun_star_chart_StandardDiagramCreationParameters_idl
#define com_sun_star_chart_StandardDiagramCreationParameters_idl
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/Symbol.idl b/offapi/com/sun/star/chart2/Symbol.idl
index c528ea86ddfe..202301e3931d 100644
--- a/offapi/com/sun/star/chart2/Symbol.idl
+++ b/offapi/com/sun/star/chart2/Symbol.idl
@@ -27,13 +27,9 @@
#ifndef com_sun_star_chart2_Symbol_idl
#define com_sun_star_chart2_Symbol_idl
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
#include <com/sun/star/awt/Size.idl>
#include <com/sun/star/graphic/XGraphic.idl>
-
#include <com/sun/star/chart2/SymbolStyle.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index d28cdcb6c4f9..8afc10a1af57 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -29,9 +29,7 @@
#include <com/sun/star/style/ParagraphProperties.idl>
#include <com/sun/star/layout/LayoutElement.idl>
-
#include <com/sun/star/chart2/XTitle.idl>
-
#include <com/sun/star/beans/PropertySet.idl>
#include <com/sun/star/drawing/LineProperties.idl>
#include <com/sun/star/drawing/FillProperties.idl>
diff --git a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
index ca455c401264..a62750fd4930 100644
--- a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_chart2_XAnyDescriptionAccess_idl__
#define __com_sun_star_chart2_XAnyDescriptionAccess_idl__
-#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__
#include <com/sun/star/chart/XComplexDescriptionAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/XAxis.idl b/offapi/com/sun/star/chart2/XAxis.idl
index 55a9089da0cf..cf5e326e58df 100644
--- a/offapi/com/sun/star/chart2/XAxis.idl
+++ b/offapi/com/sun/star/chart2/XAxis.idl
@@ -27,12 +27,8 @@
#ifndef com_sun_star_chart_XAxis_idl
#define com_sun_star_chart_XAxis_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/beans/XPropertySet.idl>
-
#include <com/sun/star/chart2/ScaleData.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XChartShape.idl b/offapi/com/sun/star/chart2/XChartShape.idl
index c58f35023457..669aadabf052 100644
--- a/offapi/com/sun/star/chart2/XChartShape.idl
+++ b/offapi/com/sun/star/chart2/XChartShape.idl
@@ -1,34 +1,14 @@
#ifndef com_sun_star_chart2_XChartShape_idl
#define com_sun_star_chart2_XChartShape_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTransformation_idl
#include <com/sun/star/chart2/XTransformation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.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
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.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
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/XChartShapeContainer.idl b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
index f7505e030de6..e32e8f47b08f 100644
--- a/offapi/com/sun/star/chart2/XChartShapeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
@@ -1,13 +1,8 @@
#ifndef com_sun_star_chart2_XChartShapeContainer_idl
#define com_sun_star_chart2_XChartShapeContainer_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/XChartType.idl b/offapi/com/sun/star/chart2/XChartType.idl
index 07f358b2ad6f..6dce9a1e16c3 100644
--- a/offapi/com/sun/star/chart2/XChartType.idl
+++ b/offapi/com/sun/star/chart2/XChartType.idl
@@ -1,14 +1,8 @@
#ifndef com_sun_star_chart2_XChartType_idl
#define com_sun_star_chart2_XChartType_idl
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/chart2/XCoordinateSystem.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XChartTypeContainer.idl b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
index c843ce10e1de..083d48742348 100644
--- a/offapi/com/sun/star/chart2/XChartTypeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
@@ -28,17 +28,9 @@
#define com_sun_star_chart2_XChartTypeContainer_idl
#include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XChartType_idl
#include <com/sun/star/chart2/XChartType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XChartTypeManager.idl b/offapi/com/sun/star/chart2/XChartTypeManager.idl
index efc9e7a12e16..bc2b23d3e178 100644
--- a/offapi/com/sun/star/chart2/XChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeManager.idl
@@ -3,7 +3,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/chart2/XChartTypeTemplate.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index 4b688f54a64c..b03f51df9915 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -27,17 +27,9 @@
#ifndef com_sun_star_chart_XChartTypeTemplate_idl
#define com_sun_star_chart_XChartTypeTemplate_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
#include <com/sun/star/chart2/XDiagram.idl>
#include <com/sun/star/chart2/data/XDataSource.idl>
#include <com/sun/star/chart2/XChartType.idl>
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystem.idl b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
index e747562e59c2..8a69c027d2a9 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
@@ -27,14 +27,8 @@
#ifndef com_sun_star_chart2_XCoordinateSystem_idl
#define com_sun_star_chart2_XCoordinateSystem_idl
-#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
-
#include <com/sun/star/chart2/XAxis.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
index afbd6066e063..4917811b53a0 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
@@ -28,15 +28,9 @@
#define com_sun_star_chart2_XCoordinateSystemContainer_idl
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/chart2/XCoordinateSystem.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index 14238dc531a5..a5f6dc2d8658 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -27,13 +27,8 @@
#ifndef com_sun_star_chart2_XDataInterpreter_idl
#define com_sun_star_chart2_XDataInterpreter_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
#include <com/sun/star/chart2/InterpretedData.idl>
#include <com/sun/star/chart2/data/XDataSource.idl>
#include <com/sun/star/chart2/XDataSeries.idl>
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index 3743650248df..88f2b92e5443 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -27,17 +27,9 @@
#ifndef com_sun_star_chart2_XDataSeries_idl
#define com_sun_star_chart2_XDataSeries_idl
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.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
module com
{
diff --git a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
index 6bf662ceb84a..05f270eb48c3 100644
--- a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
+++ b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
@@ -28,17 +28,9 @@
#define com_sun_star_chart2_XDataSeriesContainer_idl
#include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XDataSeries_idl
#include <com/sun/star/chart2/XDataSeries.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
index 30694a87e7f0..2c96a060ef71 100644
--- a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -27,13 +27,8 @@
#ifndef com_sun_star_chart2_xdefaultsizetransmitter_idl
#define com_sun_star_chart2_xdefaultsizetransmitter_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
module com
{
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index 23b256e63349..cfe57ab17973 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -27,10 +27,7 @@
#ifndef com_sun_star_chart2_XDiagram_idl
#define com_sun_star_chart2_XDiagram_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/chart2/XLegend.idl>
diff --git a/offapi/com/sun/star/chart2/XDiagramProvider.idl b/offapi/com/sun/star/chart2/XDiagramProvider.idl
index 9aaf2771b5f6..20b3358effec 100644
--- a/offapi/com/sun/star/chart2/XDiagramProvider.idl
+++ b/offapi/com/sun/star/chart2/XDiagramProvider.idl
@@ -27,10 +27,7 @@
#ifndef com_sun_star_chart2_XDiagramProvider_idl
#define com_sun_star_chart2_XDiagramProvider_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/chart2/XDiagram.idl>
#include <com/sun/star/chart2/XChartTypeTemplate.idl>
diff --git a/offapi/com/sun/star/chart2/XFastPropertyState.idl b/offapi/com/sun/star/chart2/XFastPropertyState.idl
index 29d1e4c1b27f..076813c7818c 100644
--- a/offapi/com/sun/star/chart2/XFastPropertyState.idl
+++ b/offapi/com/sun/star/chart2/XFastPropertyState.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_beans_XFastPropertyState_idl__
#define __com_sun_star_beans_XFastPropertyState_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/XFormattedString.idl b/offapi/com/sun/star/chart2/XFormattedString.idl
index 5928f41f3f9d..6c6338f41a67 100644
--- a/offapi/com/sun/star/chart2/XFormattedString.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString.idl
@@ -1,9 +1,7 @@
#ifndef com_sun_star_chart_XFormattedString_idl
#define com_sun_star_chart_XFormattedString_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XLabeled.idl b/offapi/com/sun/star/chart2/XLabeled.idl
index 4abaf59fd3ba..a3f4ff30f1c6 100644
--- a/offapi/com/sun/star/chart2/XLabeled.idl
+++ b/offapi/com/sun/star/chart2/XLabeled.idl
@@ -27,17 +27,9 @@
#ifndef com_sun_star_chart2_XLabeled_idl
#define com_sun_star_chart2_XLabeled_idl
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTitle_idl
#include <com/sun/star/chart2/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
#include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XRegressionCurve.idl b/offapi/com/sun/star/chart2/XRegressionCurve.idl
index 1e23edd1d0f1..1ef46f815ad3 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurve.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurve.idl
@@ -29,7 +29,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/XPropertySet.idl>
-
#include <com/sun/star/chart2/XRegressionCurveCalculator.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
index a7e5530601b6..fbd63fe01394 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
@@ -28,7 +28,6 @@
#define com_sun_star_chart2_XRegressionCurveCalculator_idl
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
#include <com/sun/star/geometry/RealPoint2D.idl>
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
index f54b351ef005..76690e3413a2 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
@@ -28,15 +28,9 @@
#define com_sun_star_chart2_XRegressionCurveContainer_idl
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/chart2/XRegressionCurve.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XScaling.idl b/offapi/com/sun/star/chart2/XScaling.idl
index 569f29ff2128..b68ee3aea3c6 100644
--- a/offapi/com/sun/star/chart2/XScaling.idl
+++ b/offapi/com/sun/star/chart2/XScaling.idl
@@ -1,9 +1,7 @@
#ifndef com_sun_star_chart2_XScaling_idl
#define com_sun_star_chart2_XScaling_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/chart2/XStyleSupplier.idl b/offapi/com/sun/star/chart2/XStyleSupplier.idl
index cfc4d34ca5fa..f532b8f4da62 100644
--- a/offapi/com/sun/star/chart2/XStyleSupplier.idl
+++ b/offapi/com/sun/star/chart2/XStyleSupplier.idl
@@ -27,15 +27,9 @@
#ifndef com_sun_star_style_XStyleSupplier_idl
#define com_sun_star_style_XStyleSupplier_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/XTarget.idl b/offapi/com/sun/star/chart2/XTarget.idl
index e41afe75fe50..65ea3175d6a7 100644
--- a/offapi/com/sun/star/chart2/XTarget.idl
+++ b/offapi/com/sun/star/chart2/XTarget.idl
@@ -1,9 +1,7 @@
#ifndef com_sun_star_chart2_XTarget_idl
#define com_sun_star_chart2_XTarget_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module chart2 {
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 9be6629c12df..6defce7cc9b2 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -27,10 +27,7 @@
#ifndef com_sun_star_chart_XTitle_idl
#define com_sun_star_chart_XTitle_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/chart2/XFormattedString.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index 4f6d2c1faf2a..b2726f9af8a9 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -27,10 +27,7 @@
#ifndef com_sun_star_chart_XTitled_idl
#define com_sun_star_chart_XTitled_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/chart2/XTitle.idl>
module com
diff --git a/offapi/com/sun/star/chart2/XTransformation.idl b/offapi/com/sun/star/chart2/XTransformation.idl
index adbfd0751cf2..e8ec8c029460 100644
--- a/offapi/com/sun/star/chart2/XTransformation.idl
+++ b/offapi/com/sun/star/chart2/XTransformation.idl
@@ -27,13 +27,8 @@
#ifndef com_sun_star_chart2_XTransformation_idl
#define com_sun_star_chart2_XTransformation_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/data/DataSequence.idl b/offapi/com/sun/star/chart2/data/DataSequence.idl
index aa35f5ae8453..e6b914af8f50 100644
--- a/offapi/com/sun/star/chart2/data/DataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequence.idl
@@ -31,11 +31,9 @@
#include <com/sun/star/container/XIndexReplace.idl>
#include <com/sun/star/util/XCloneable.idl>
#include <com/sun/star/util/XModifyBroadcaster.idl>
-
#include <com/sun/star/chart2/data/XDataSequence.idl>
#include <com/sun/star/chart2/data/XNumericalDataSequence.idl>
#include <com/sun/star/chart2/data/XTextualDataSequence.idl>
-
#include <com/sun/star/chart2/data/DataSequenceRole.idl>
module com
diff --git a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
index d6dcf7f5efa4..6daee636d067 100644
--- a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
@@ -29,7 +29,6 @@
#include <com/sun/star/util/XCloneable.idl>
#include <com/sun/star/util/XModifyBroadcaster.idl>
-
#include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
module com
diff --git a/offapi/com/sun/star/chart2/data/XDataProvider.idl b/offapi/com/sun/star/chart2/data/XDataProvider.idl
index b1e36f7020d9..12b54a63723e 100644
--- a/offapi/com/sun/star/chart2/data/XDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDataProvider.idl
@@ -29,11 +29,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/chart2/data/XDataSource.idl>
-
#include <com/sun/star/beans/PropertyValue.idl>
-
#include <com/sun/star/sheet/XRangeSelection.idl>
module com
diff --git a/offapi/com/sun/star/chart2/data/XDataReceiver.idl b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
index 13cb972d25a0..07a58072c137 100644
--- a/offapi/com/sun/star/chart2/data/XDataReceiver.idl
+++ b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
@@ -27,28 +27,12 @@
#ifndef com_sun_star_chart2_data_XDataReceiver_idl
#define com_sun_star_chart2_data_XDataReceiver_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XDataProvider_idl
#include <com/sun/star/chart2/data/XDataProvider.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
#include <com/sun/star/chart2/data/XRangeHighlighter.idl>
-#endif
-
-#ifndef com_sun_star_beans_PropertyValue_idl
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/chart2/data/XDataSink.idl b/offapi/com/sun/star/chart2/data/XDataSink.idl
index ec7f922bbc53..49208691c148 100644
--- a/offapi/com/sun/star/chart2/data/XDataSink.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSink.idl
@@ -28,7 +28,6 @@
#define com_sun_star_chart2_data_XDataSink_idl
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
module com
diff --git a/offapi/com/sun/star/chart2/data/XDataSource.idl b/offapi/com/sun/star/chart2/data/XDataSource.idl
index 9fc4436a25b9..dda444e2461d 100644
--- a/offapi/com/sun/star/chart2/data/XDataSource.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSource.idl
@@ -28,7 +28,6 @@
#define com_sun_star_chart2_data_XDataSource_idl
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
module com
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index c67b7687ec6c..abe0c45b08f2 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_report_XDatabaseDataProvider_idl__
#define __com_sun_star_report_XDatabaseDataProvider_idl__
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/beans/UnknownPropertyException.idl>
#include <com/sun/star/lang/XInitialization.idl>
diff --git a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
index 95cb9ce06de6..077227f40e02 100644
--- a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
@@ -27,17 +27,9 @@
#ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
#define com_sun_star_chart2_data_XRangeHighlighter_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
#include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_HighlightedRange_idl
#include <com/sun/star/chart2/data/HighlightedRange.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/configuration/AccessRootElement.idl b/offapi/com/sun/star/configuration/AccessRootElement.idl
index 5f9b33d07e93..4787451853c1 100644
--- a/offapi/com/sun/star/configuration/AccessRootElement.idl
+++ b/offapi/com/sun/star/configuration/AccessRootElement.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_AccessRootElement_idl__
#define __com_sun_star_configuration_AccessRootElement_idl__
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
#include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
#include <com/sun/star/util/XChangesNotifier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index deacc1d9eab1..af801bde4034 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
#define __com_sun_star_configuration_ConfigurationProvider_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
index 7e6bb2daaaff..5ed6c9c726b2 100644
--- a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
#define __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/ConfigurationAccess.idl b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
index 0b04b4bc12cb..f4d7820656e5 100644
--- a/offapi/com/sun/star/configuration/ConfigurationAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
#define __com_sun_star_configuration_ConfigurationAccess_idl__
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
#include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
#include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetAccess_idl__
#include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
#include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
#include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetElement_idl__
#include <com/sun/star/configuration/SetElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupElement_idl__
#include <com/sun/star/configuration/GroupElement.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/ConfigurationProvider.idl b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
index 2807fc6c9911..257a8eca2a71 100644
--- a/offapi/com/sun/star/configuration/ConfigurationProvider.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
#define __com_sun_star_configuration_ConfigurationProvider_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index 828bf0203e7b..342e8576bd8a 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -29,12 +29,8 @@
//=============================================================================
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
module com { module sun { module star { module configuration {
diff --git a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
index 500768dc64c3..e42571cc7456 100644
--- a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
#define __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
-#ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
#include <com/sun/star/configuration/ConfigurationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetUpdate_idl__
#include <com/sun/star/configuration/SetUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupUpdate_idl__
#include <com/sun/star/configuration/GroupUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_UpdateRootElement_idl__
#include <com/sun/star/configuration/UpdateRootElement.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
index a2e827003eb3..77e5f5f40f17 100644
--- a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
#define __com_sun_star_configuration_CorruptedConfigurationException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
index 5373cb570a91..03e14897f5c1 100644
--- a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
#define __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
-#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
#include <com/sun/star/configuration/CorruptedConfigurationException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/DefaultProvider.idl b/offapi/com/sun/star/configuration/DefaultProvider.idl
index 0fc09a078acc..a2875c68f4e6 100644
--- a/offapi/com/sun/star/configuration/DefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/DefaultProvider.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_DefaultProvider_idl__
#define __com_sun_star_configuration_DefaultProvider_idl__
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
#include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/GroupAccess.idl b/offapi/com/sun/star/configuration/GroupAccess.idl
index cb089950f656..5c069c539508 100644
--- a/offapi/com/sun/star/configuration/GroupAccess.idl
+++ b/offapi/com/sun/star/configuration/GroupAccess.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_GroupAccess_idl__
#define __com_sun_star_configuration_GroupAccess_idl__
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
#include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
#include <com/sun/star/configuration/PropertyHierarchy.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
#include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/GroupElement.idl b/offapi/com/sun/star/configuration/GroupElement.idl
index 0f66580b0c92..822b5f8bbdf7 100644
--- a/offapi/com/sun/star/configuration/GroupElement.idl
+++ b/offapi/com/sun/star/configuration/GroupElement.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_GroupElement_idl__
#define __com_sun_star_configuration_GroupElement_idl__
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
#include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/GroupUpdate.idl b/offapi/com/sun/star/configuration/GroupUpdate.idl
index 0c7184c003c7..108f5ca769bc 100644
--- a/offapi/com/sun/star/configuration/GroupUpdate.idl
+++ b/offapi/com/sun/star/configuration/GroupUpdate.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_GroupUpdate_idl__
#define __com_sun_star_configuration_GroupUpdate_idl__
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
#include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameReplace_idl__
#include <com/sun/star/container/XNameReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/HierarchyAccess.idl b/offapi/com/sun/star/configuration/HierarchyAccess.idl
index a476ea266f0d..fb1fc1756266 100644
--- a/offapi/com/sun/star/configuration/HierarchyAccess.idl
+++ b/offapi/com/sun/star/configuration/HierarchyAccess.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
#define __com_sun_star_configuration_HierarchyAccess_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XExactName_idl__
#include <com/sun/star/beans/XExactName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
#include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/HierarchyElement.idl b/offapi/com/sun/star/configuration/HierarchyElement.idl
index 7a784821e202..ce9a536acb87 100644
--- a/offapi/com/sun/star/configuration/HierarchyElement.idl
+++ b/offapi/com/sun/star/configuration/HierarchyElement.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_configuration_HierarchyElement_idl__
#define __com_sun_star_configuration_HierarchyElement_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalName_idl__
#include <com/sun/star/container/XHierarchicalName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XProperty_idl__
#include <com/sun/star/beans/XProperty.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyWithState_idl__
#include <com/sun/star/beans/XPropertyWithState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
index 568c36674286..f3328af71d35 100644
--- a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
+++ b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_InstallationIncompleteException_idl__
#define __com_sun_star_configuration_InstallationIncompleteException_idl__
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
index d7cba09edf41..edf8aeb9479d 100644
--- a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_InvalidBootstrapFileException_idl__
#define __com_sun_star_configuration_InvalidBootstrapFileException_idl__
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
index b9588dc09a83..9a553e832e36 100644
--- a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_MissingBootstrapFileException_idl__
#define __com_sun_star_configuration_MissingBootstrapFileException_idl__
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/PropertyHierarchy.idl b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
index 3d37344a2c33..202605607f95 100644
--- a/offapi/com/sun/star/configuration/PropertyHierarchy.idl
+++ b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
#define __com_sun_star_configuration_PropertyHierarchy_idl__
-#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_beans_XHierarchicalPropertySet_idl__
#include <com/sun/star/beans/XHierarchicalPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
#include <com/sun/star/beans/XMultiHierarchicalPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/SetAccess.idl b/offapi/com/sun/star/configuration/SetAccess.idl
index 9b564d90eabd..ea2e67692882 100644
--- a/offapi/com/sun/star/configuration/SetAccess.idl
+++ b/offapi/com/sun/star/configuration/SetAccess.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_SetAccess_idl__
#define __com_sun_star_configuration_SetAccess_idl__
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
#include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
#include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/SetElement.idl b/offapi/com/sun/star/configuration/SetElement.idl
index f82b642934be..4d679e335f52 100644
--- a/offapi/com/sun/star/configuration/SetElement.idl
+++ b/offapi/com/sun/star/configuration/SetElement.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_SetElement_idl__
#define __com_sun_star_configuration_SetElement_idl__
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
#include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateInstance_idl__
#include <com/sun/star/configuration/XTemplateInstance.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/SetUpdate.idl b/offapi/com/sun/star/configuration/SetUpdate.idl
index 57c56e7d0231..cfa7a8c6a120 100644
--- a/offapi/com/sun/star/configuration/SetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SetUpdate.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_SetUpdate_idl__
#define __com_sun_star_configuration_SetUpdate_idl__
-#ifndef __com_sun_star_configuration_SetAccess_idl__
#include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
#include <com/sun/star/configuration/SimpleSetUpdate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/SimpleSetAccess.idl b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
index 35f8745fe977..458c2e8ec12f 100644
--- a/offapi/com/sun/star/configuration/SimpleSetAccess.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
#define __com_sun_star_configuration_SimpleSetAccess_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateContainer_idl__
#include <com/sun/star/configuration/XTemplateContainer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XStringEscape_idl__
#include <com/sun/star/util/XStringEscape.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
index c9fb908281d1..cbd1641816d9 100644
--- a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
#define __com_sun_star_configuration_SimpleSetUpdate_idl__
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
#include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/UpdateRootElement.idl b/offapi/com/sun/star/configuration/UpdateRootElement.idl
index 16ffa9450a08..d6ca451fae2c 100644
--- a/offapi/com/sun/star/configuration/UpdateRootElement.idl
+++ b/offapi/com/sun/star/configuration/UpdateRootElement.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_UpdateRootElement_idl__
#define __com_sun_star_configuration_UpdateRootElement_idl__
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
#include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__
#include <com/sun/star/util/XChangesBatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/XTemplateContainer.idl b/offapi/com/sun/star/configuration/XTemplateContainer.idl
index 84331c660c19..a25a77567b7e 100644
--- a/offapi/com/sun/star/configuration/XTemplateContainer.idl
+++ b/offapi/com/sun/star/configuration/XTemplateContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_XTemplateContainer_idl__
#define __com_sun_star_configuration_XTemplateContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/XTemplateInstance.idl b/offapi/com/sun/star/configuration/XTemplateInstance.idl
index f624ce8705f7..dd2b4ad6190b 100644
--- a/offapi/com/sun/star/configuration/XTemplateInstance.idl
+++ b/offapi/com/sun/star/configuration/XTemplateInstance.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_XTemplateInstance_idl__
#define __com_sun_star_configuration_XTemplateInstance_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
index 32ee9cf05f2f..228d33e4f150 100644
--- a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
#define __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
#include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Backend.idl b/offapi/com/sun/star/configuration/backend/Backend.idl
index 9d0b82e0ade4..2bd3d29ab28b 100644
--- a/offapi/com/sun/star/configuration/backend/Backend.idl
+++ b/offapi/com/sun/star/configuration/backend/Backend.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_Backend_idl__
#define __com_sun_star_configuration_backend_Backend_idl__
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
#include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
#include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
index d5c80d01ee0b..f89b336aab0e 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#define __com_sun_star_configuration_backend_BackendAccessException_idl__
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
index 176abb2d1ce0..1aed7c8719c8 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
#define __com_sun_star_configuration_backend_BackendAdapter_idl__
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
#include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
index c5ce0d0c47cd..860bcb1714dd 100644
--- a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
#define __com_sun_star_configuration_backend_BackendSetupException_idl__
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
index 04a1d44b9c03..affdf32dea18 100644
--- a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
+++ b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_CannotConnectException_idl__
#define __com_sun_star_configuration_backend_CannotConnectException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
#include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
index afe42f257a83..5105cf3d706b 100644
--- a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
+++ b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
#define __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
module com { module sun { module star { module configuration { module backend {
diff --git a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
index f6213e9327c5..6769ffd2e420 100644
--- a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
+++ b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_ConnectionLostException_idl__
#define __com_sun_star_configuration_backend_ConnectionLostException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CopyImporter.idl b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
index ab790ba521e1..34a7ef7f9050 100644
--- a/offapi/com/sun/star/configuration/backend/CopyImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_CopyImporter_idl__
#define __com_sun_star_configuration_backend_CopyImporter_idl__
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
#include <com/sun/star/configuration/backend/Importer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/DataImporter.idl b/offapi/com/sun/star/configuration/backend/DataImporter.idl
index a3b039e24ca0..9c7792b55e2d 100644
--- a/offapi/com/sun/star/configuration/backend/DataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/DataImporter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_DataImporter_idl__
#define __com_sun_star_configuration_backend_DataImporter_idl__
-#ifndef __com_sun_star_task_XJob_idl__
#include <com/sun/star/task/XJob.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
index 38ddc1e034e7..a22d72fb9ab2 100644
--- a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_DefaultBackend_idl__
#define __com_sun_star_configuration_backend_DefaultBackend_idl__
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
#include <com/sun/star/configuration/backend/Backend.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
index 22f07f63b37b..bfb7452b59b9 100644
--- a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
#define __com_sun_star_configuration_backend_HierarchyBrowser_idl__
-#ifndef __com_sun_star_task_XJob_idl__
#include <com/sun/star/task/XJob.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/Importer.idl b/offapi/com/sun/star/configuration/backend/Importer.idl
index 8cb74626c6be..118b70388a18 100644
--- a/offapi/com/sun/star/configuration/backend/Importer.idl
+++ b/offapi/com/sun/star/configuration/backend/Importer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_Importer_idl__
#define __com_sun_star_configuration_backend_Importer_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
#include <com/sun/star/configuration/backend/XLayerImporter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
index 81da4911437b..b570ea3b1065 100644
--- a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
+++ b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
#define __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
index 50d9650636ff..be5628fae56f 100644
--- a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
+++ b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
#define __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
#include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
module com { module sun { module star { module configuration {
module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Layer.idl b/offapi/com/sun/star/configuration/backend/Layer.idl
index 545bddad641e..49aebb43e668 100644
--- a/offapi/com/sun/star/configuration/backend/Layer.idl
+++ b/offapi/com/sun/star/configuration/backend/Layer.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_configuration_backend_Layer_idl__
#define __com_sun_star_configuration_backend_Layer_idl__
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
#include <com/sun/star/configuration/backend/XCompositeLayer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XTimeStamped_idl__
#include <com/sun/star/util/XTimeStamped.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
index f8c27433929f..6555dca64e0f 100644
--- a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
@@ -1,13 +1,8 @@
#ifndef __com_sun_star_configuration_backend_LayerDescriber_idl__
#define __com_sun_star_configuration_backend_LayerDescriber_idl__
-#ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
#include <com/sun/star/configuration/backend/XLayerContentDescriber.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
diff --git a/offapi/com/sun/star/configuration/backend/LayerFilter.idl b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
index 357b5ba6b2e7..9218465ba9a9 100644
--- a/offapi/com/sun/star/configuration/backend/LayerFilter.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_configuration_backend_LayerFilter_idl__
#define __com_sun_star_configuration_backend_LayerFilter_idl__
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
index 88e9611d46a5..c221ee819c5d 100644
--- a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
#define __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
#include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
index eb7b7c540acc..fe93e0b32118 100644
--- a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
#define __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
-#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
#include <com/sun/star/configuration/backend/MultiLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
index ebdce5e9c22e..1b1601d743e7 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LdapSingleBackend_idl__
#define __com_sun_star_configuration_backend_LdapSingleBackend_idl__
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
#include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
index 86195e67377b..99d9d0db69c4 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LdapSingleStratum_idl__
#define __com_sun_star_configuration_backend_LdapSingleStratum_idl__
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
#include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
index 9c1dd5ee77f0..48435d7ff134 100644
--- a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LocalDataImporter_idl__
#define __com_sun_star_configuration_backend_LocalDataImporter_idl__
-#ifndef __com_sun_star_configuration_backend_DataImporter_idl__
#include <com/sun/star/configuration/backend/DataImporter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
index ae7244365af2..7903186fbf6f 100644
--- a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
#define __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
-#ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
#include <com/sun/star/configuration/backend/HierarchyBrowser.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
index 3c72d908579c..f6806928daf8 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
#define __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
-#ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
#include <com/sun/star/configuration/backend/SchemaSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
index 2af70f5b2f1c..b1a20ca7f4e2 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LocalSingleBackend_idl__
#define __com_sun_star_configuration_backend_LocalSingleBackend_idl__
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
#include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
index aea200df1925..86c47e989b0d 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_LocalSingleStratum_idl__
#define __com_sun_star_configuration_backend_LocalSingleStratum_idl__
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
#include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
index d2ce0251c457..b529b1c12932 100644
--- a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
+++ b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#define __com_sun_star_configuration_backend_MalformedDataException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MergeImporter.idl b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
index d02d68985f32..d0f39d923b14 100644
--- a/offapi/com/sun/star/configuration/backend/MergeImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_MergeImporter_idl__
#define __com_sun_star_configuration_backend_MergeImporter_idl__
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
#include <com/sun/star/configuration/backend/Importer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index d5decc5d0907..e87f29522895 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
#define __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 375f8851829c..32772aa98ea7 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
#define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
#include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
index 7e755d187d94..9eddb8b60ee9 100644
--- a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_MultiStratumBackend_idl__
#define __com_sun_star_configuration_backend_MultiStratumBackend_idl__
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
#include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
index 4d7c1d3706ff..b1f710f63a17 100644
--- a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_OfflineBackend_idl__
#define __com_sun_star_configuration_backend_OfflineBackend_idl__
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
#include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
index a0d8e39abaf8..046d0e6c3761 100644
--- a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_OnlineBackend_idl__
#define __com_sun_star_configuration_backend_OnlineBackend_idl__
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
#include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
index 70577522da86..817c0d373a03 100644
--- a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_PlatformBackend_idl__
#define __com_sun_star_configuration_backend_PlatformBackend_idl__
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
#include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index e5d8c55a6d15..7c7778518c4b 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_configuration_backend_Schema_idl__
#define __com_sun_star_configuration_backend_Schema_idl__
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
#include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
index 10b59ddc5c6d..fc932b809518 100644
--- a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
#define __com_sun_star_configuration_backend_SchemaSupplier_idl__
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
#include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackend.idl b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
index 911fa93f32c6..a9bc99b60322 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
#define __com_sun_star_configuration_backend_SingleBackend_idl__
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
#include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
#include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
index 6135f75d9f68..704a56d436c8 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
#define __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
#include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
index 8f6a28085c7a..3da3b5cdbd20 100644
--- a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
#define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
#include <com/sun/star/configuration/backend/XSingleLayerStratum.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index 825c81a254ef..628b8a602e01 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_backend_StratumCreationException_idl__
#define __com_sun_star_configuration_backend_StratumCreationException_idl__
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
#include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
index 69230cc2561e..1a278478e139 100644
--- a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
+++ b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_SystemIntegration_idl__
#define __com_sun_star_configuration_backend_SystemIntegration_idl__
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
#include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
module com { module sun { module star { module configuration { module backend {
diff --git a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
index f74b1f2d5ce8..3b6e79bd2943 100644
--- a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_configuration_backend_UpdatableLayer_idl__
#define __com_sun_star_configuration_backend_UpdatableLayer_idl__
-#ifndef __com_sun_star_configuration_backend_Layer_idl__
#include <com/sun/star/configuration/backend/Layer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
#include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XBackend.idl b/offapi/com/sun/star/configuration/backend/XBackend.idl
index 5696bff294b3..861aea194e9c 100644
--- a/offapi/com/sun/star/configuration/backend/XBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackend.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_configuration_backend_XBackend_idl__
#define __com_sun_star_configuration_backend_XBackend_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
#include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
#include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
index 6530e7182fea..93640149a7d1 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
#define __com_sun_star_configuration_backend_XBackendChangesListener_idl__
-#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
#include <com/sun/star/configuration/backend/ComponentChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module configuration { module backend {
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
index 637527de5895..adf653eabeee 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
#define __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
-#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
#include <com/sun/star/configuration/backend/XBackendChangesListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
index 9829ad993ec3..dbe929949fa3 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
@@ -27,16 +27,9 @@
#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
#define __com_sun_star_configuration_backend_XBackendEntities_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
index 74dc11e27820..4b95cde305a3 100644
--- a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
#define __com_sun_star_configuration_backend_XCompositeLayer_idl__
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XLayer.idl b/offapi/com/sun/star/configuration/backend/XLayer.idl
index 89911d869dc8..b2ff93184240 100644
--- a/offapi/com/sun/star/configuration/backend/XLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayer.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#define __com_sun_star_configuration_backend_XLayer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
#include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
index 2cf142349f21..c1ca697b49ca 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
#define __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
-#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__
#include <com/sun/star/configuration/backend/PropertyInfo.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
#include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index 15ba5085ef25..5ca2c1e10903 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
#define __com_sun_star_configuration_backend_XLayerHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
index ee0d686dd640..ce8eefc526df 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
@@ -27,30 +27,13 @@
#ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
#define __com_sun_star_configuration_backend_XLayerImporter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
#include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
index 52b946a2f2ec..f17683c237cb 100644
--- a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
#define __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
#include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XSchema.idl b/offapi/com/sun/star/configuration/backend/XSchema.idl
index 6f761216fd39..e0ee0aba3051 100644
--- a/offapi/com/sun/star/configuration/backend/XSchema.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchema.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_configuration_backend_XSchema_idl__
#define __com_sun_star_configuration_backend_XSchema_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
#include <com/sun/star/configuration/backend/XSchemaHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index b1dae967d353..b1e11ec9946d 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
#define __com_sun_star_configuration_backend_XSchemaHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
index d8005be6a38b..a896fc8ce698 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
#define __com_sun_star_configuration_backend_XSchemaSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
#include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
index 96ac572e82db..38a10baa2589 100644
--- a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
#define __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
#include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
index c2fdf99e2eb0..f0d106feea43 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
#define __com_sun_star_configuration_backend_XUpdatableLayer_idl__
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
//==============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
index 5545fc3bfa21..49609e284522 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
#define __com_sun_star_configuration_backend_XUpdateHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
index 2bcefd070ac3..773457a9811e 100644
--- a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
#define __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
#include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
#include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
index f95dc12b5022..5e2c3e497d75 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_xml_LayerParser_idl__
#define __com_sun_star_configuration_backend_xml_LayerParser_idl__
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
#include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
index a578418ae25e..25e930484897 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_xml_LayerWriter_idl__
#define __com_sun_star_configuration_backend_xml_LayerWriter_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
#include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
index f280f221ff9c..0d734e6a1e61 100644
--- a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_configuration_backend_xml_SchemaParser_idl__
#define __com_sun_star_configuration_backend_xml_SchemaParser_idl__
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
#include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
index 1d66d43ad0e0..7cc1d0932daf 100644
--- a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
+++ b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
#define __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
-#ifndef __com_sun_star_uno_XComponentContext_idl__
#include <com/sun/star/uno/XComponentContext.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
index 29e9479f4a01..afb65c460126 100644
--- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__
#define __com_sun_star_datatransfer_DataFormatTranslator_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 82deb7314b0c..9f019ca2b520 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_datatransfer_MimeContentType_idl__
#define __com_sun_star_datatransfer_MimeContentType_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
index 0d0ffda23547..7171915ecc9d 100644
--- a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
+++ b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#define __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
index 07f7f93612cd..fe097d5ae9fb 100644
--- a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
@@ -29,13 +29,8 @@
#ifndef __com_sun_star_datatransfer_XDataFormatTranslator_idl__
#define __com_sun_star_datatransfer_XDataFormatTranslator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
module com { module sun { module star { module datatransfer {
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentType.idl b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
index ccfee62c6a2b..f296fccd651e 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentType.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
@@ -29,13 +29,8 @@
#ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
#define __com_sun_star_datatransfer_XMimeContentType_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com { module sun { module star { module datatransfer {
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
index 5b7df3168c3b..2601fc977d52 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
@@ -29,17 +29,9 @@
#ifndef __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
#define __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
#include <com/sun/star/datatransfer/XMimeContentType.idl>
-#endif
module com { module sun { module star { module datatransfer {
diff --git a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
index ad634d8a6190..35fcb7a57cbe 100644
--- a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_XSystemTransferable_idl__
#define __com_sun_star_datatransfer_XSystemTransferable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 093b93ee5f28..d89de2641f0d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_XTransferDataInfo_idl__
#define __com_sun_star_datatransfer_XTransferDataInfo_idl__
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XTransferable.idl b/offapi/com/sun/star/datatransfer/XTransferable.idl
index 3336b2d5db0b..836c42e4bed4 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#define __com_sun_star_datatransfer_XTransferable_idl__
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XTransferableEx.idl b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
index ab388725170f..5de7275fe70d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableEx.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_XTransferableEx_idl__
#define __com_sun_star_datatransfer_XTransferable_idl__
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSource.idl b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
index 0ff9bca08302..673268297313 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSource.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_XTransferableSource_idl__
#define __com_sun_star_datatransfer_XTransferableSource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
index 2cf5c4967597..7e8a89cac7b4 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
#define __com_sun_star_datatransfer_XTransferableSupplier_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index c7085041b3d0..d77c6bd6d412 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
#define __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
index 369bfd9c53d0..0294a51fcc98 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
#define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
index 7a128ee2d108..e2cf5fbdb0f5 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
#define __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index 43a8e0e5ba76..8ac56b72f95c 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
#define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 41db7f1401c9..68c642bf4aac 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboard_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
index 11f0757fe740..c4191c4bc554 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
-#ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
#include <com/sun/star/datatransfer/clipboard/XClipboard.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
index 24ded33f7239..8d9de83cc335 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
index 36305a4ae412..435e4cd98f18 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
-#ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
#include <com/sun/star/datatransfer/clipboard/ClipboardEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
index e9626c9fcd84..3dc8787e1560 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
index 7df1e7ae7645..e276f95edfd0 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index d27468f65111..86417dae7329 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
#define __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
index d3e1682090f7..2c51a9031004 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
#define __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
index bc23cd376ced..9485b88834f4 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
#define __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
index 4a51d894e1a6..45565bd69e33 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
#define __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
index 3ff38b281d17..8827fde1b24f 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
#define __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
index 3cf97f7c4418..1e2a473848bf 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
#define __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 688cfe843d52..f37f471cf45d 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
#define __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
index d8280d0e5454..66d7c6636e34 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
#define __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
#include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
index 7d15722098bf..a533dadef329 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
#define __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
#include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
index c73958afce3a..cb152bb66d3a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
#define __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
index 80397604cdc8..b8c7664c2e7a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
#define __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
index d6d3571ebb58..67849ba3673b 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_dnd_OleDragSource_idl__
#define __com_sun_star_datatransfer_dnd_OleDragSource_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
index 9b986a655a65..aede951e5f70 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
#define __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
index c301d81e24f8..76f820702ae3 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_dnd_X11DragSource_idl__
#define __com_sun_star_datatransfer_dnd_X11DragSource_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
index 0ed961ede186..73d71126d797 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
#define __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
index 37efc1d7f6cd..163ae13a90d3 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
#define __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
index 3aa14195448a..37e72e6bcc39 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
#define __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
index 1d0fc5b63d13..0fe553b8d7fd 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
#define __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
index a67de276c1a5..d7e8459c0933 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_datatransfer_dnd_XDragSource_idl__
#define __com_sun_star_datatransfer_dnd_XDragSource_idl__
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
#include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
index 3c212d8999b0..9930ed2e0c3d 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
#define __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
index b15896be1e6a..e6334e51cd91 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
#define __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
#include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
index f4b52182583a..704097b40f8c 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_XDropTarget_idl__
#define __com_sun_star_datatransfer_dnd_XDropTarget_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
index 261ad3a857f0..2454149e4639 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
#define __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
#include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
index 6cd354a92b2e..1a93c2df6c99 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
#define __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
#include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
index 32efb1559a5a..f7dba8d2fc67 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
#define __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/AmbigousFilterRequest.idl b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
index 430614767471..860fec43eab6 100644
--- a/offapi/com/sun/star/document/AmbigousFilterRequest.idl
+++ b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
#define __com_sun_star_document_AmbigousFilterRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/BrokenPackageRequest.idl b/offapi/com/sun/star/document/BrokenPackageRequest.idl
index 04b9b795027d..e3a834832ce3 100644
--- a/offapi/com/sun/star/document/BrokenPackageRequest.idl
+++ b/offapi/com/sun/star/document/BrokenPackageRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_BrokenPackageRequest_idl__
#define __com_sun_star_document_BrokenPackageRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/ChangedByOthersRequest.idl b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
index 04e22ce539f9..d7e2adfb1a48 100644
--- a/offapi/com/sun/star/document/ChangedByOthersRequest.idl
+++ b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_ChangedByOthersRequest_idl__
#define __com_sun_star_document_ChangedByOthersRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
index e3fbf81c7223..998afae94df7 100644
--- a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
+++ b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_CorruptedFilterConfigurationException_idl__
#define __com_sun_star_document_CorruptedFilterConfigurationException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index caa717a8217a..a835555a672b 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_document_DocumentEvent_idl__
#define __com_sun_star_document_DocumentEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XController2_idl__
#include <com/sun/star/frame/XController2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/DocumentInfo.idl b/offapi/com/sun/star/document/DocumentInfo.idl
index bd89a83835f4..1560e3bd9e2d 100644
--- a/offapi/com/sun/star/document/DocumentInfo.idl
+++ b/offapi/com/sun/star/document/DocumentInfo.idl
@@ -27,36 +27,14 @@
#ifndef __com_sun_star_document_DocumentInfo_idl__
#define __com_sun_star_document_DocumentInfo_idl__
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
#include <com/sun/star/document/XDocumentInfo.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_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index 5b00f6c9a8e2..53ed7572cafa 100644
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_DocumentProperties_idl__
#define __com_sun_star_document_DocumentProperties_idl__
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
#include <com/sun/star/document/XDocumentProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
index 6a2567abfab5..55a45216125a 100644
--- a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_DocumentRevisionListPersistence_idl__
#define __com_sun_star_document_DocumentRevisionListPersistence_idl__
-#ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
#include <com/sun/star/document/XDocumentRevisionListPersistence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/EventObject.idl b/offapi/com/sun/star/document/EventObject.idl
index 5a84f5c65a21..927c34b23797 100644
--- a/offapi/com/sun/star/document/EventObject.idl
+++ b/offapi/com/sun/star/document/EventObject.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_EventObject_idl__
#define __com_sun_star_document_EventObject_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/Events.idl b/offapi/com/sun/star/document/Events.idl
index 267f9c5329d0..4bf901d4c4b0 100644
--- a/offapi/com/sun/star/document/Events.idl
+++ b/offapi/com/sun/star/document/Events.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_Events_idl__
#define __com_sun_star_document_Events_idl__
-#ifndef __com_sun_star_container_XNameReplace_idl__
#include <com/sun/star/container/XNameReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/ExportFilter.idl b/offapi/com/sun/star/document/ExportFilter.idl
index 6341f4c0ad2e..2598bb19b354 100644
--- a/offapi/com/sun/star/document/ExportFilter.idl
+++ b/offapi/com/sun/star/document/ExportFilter.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_ExportFilter_idl__
#define __com_sun_star_document_ExportFilter_idl__
-#ifndef __com_sun_star_document_XExporter_idl__
#include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetection.idl b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
index f0081f94895d..01a911051f56 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetection.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_ExtendedTypeDetection_idl__
#define __com_sun_star_document_ExtendedTypeDetection_idl__
-#ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
#include <com/sun/star/document/XExtendedFilterDetection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
index 0547f50ba162..074477fc22d0 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
#define __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 800ba1372115..70ae88598038 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -27,9 +27,7 @@
#ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
#define _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
#include <com/sun/star/document/XFilterAdapter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/FilterFactory.idl b/offapi/com/sun/star/document/FilterFactory.idl
index 6ff64c7f0857..95afa49d310f 100644
--- a/offapi/com/sun/star/document/FilterFactory.idl
+++ b/offapi/com/sun/star/document/FilterFactory.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_FilterFactory_idl__
#define __com_sun_star_document_FilterFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index 4b6bcb70e729..db78482437a9 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
#define __com_sun_star_document_AmbigousFilterRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/HeaderFooterSettings.idl b/offapi/com/sun/star/document/HeaderFooterSettings.idl
index 729a6f99e0b2..7d25734b4012 100644
--- a/offapi/com/sun/star/document/HeaderFooterSettings.idl
+++ b/offapi/com/sun/star/document/HeaderFooterSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
#define __com_sun_star_document_HeaderFooterSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/ImportFilter.idl b/offapi/com/sun/star/document/ImportFilter.idl
index a24b33e25cab..d040d0fd4343 100644
--- a/offapi/com/sun/star/document/ImportFilter.idl
+++ b/offapi/com/sun/star/document/ImportFilter.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_ImportFilter_idl__
#define __com_sun_star_document_ImportFilter_idl__
-#ifndef __com_sun_star_document_XImporter_idl__
#include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/LinkTarget.idl b/offapi/com/sun/star/document/LinkTarget.idl
index b189a342c2f2..90e12ba16b49 100644
--- a/offapi/com/sun/star/document/LinkTarget.idl
+++ b/offapi/com/sun/star/document/LinkTarget.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_document_LinkTarget_idl__
#define __com_sun_star_document_LinkTarget_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
#include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/LinkTargets.idl b/offapi/com/sun/star/document/LinkTargets.idl
index cd5fb928a6eb..742e69d35edf 100644
--- a/offapi/com/sun/star/document/LinkTargets.idl
+++ b/offapi/com/sun/star/document/LinkTargets.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_LinkTargets_idl__
#define __com_sun_star_document_LinkTargets_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
index d13a904ab80b..0ce59d8d6231 100644
--- a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
+++ b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_LockFileIgnoreRequest_idl__
#define __com_sun_star_document_LockFileIgnoreRequest_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/LockedDocumentRequest.idl b/offapi/com/sun/star/document/LockedDocumentRequest.idl
index 23059c9c176c..cb6903171249 100644
--- a/offapi/com/sun/star/document/LockedDocumentRequest.idl
+++ b/offapi/com/sun/star/document/LockedDocumentRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_LockedDocumentRequest_idl__
#define __com_sun_star_document_LockedDocumentRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/LockedOnSavingRequest.idl b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
index 2dc63260bfad..b1a19293d994 100644
--- a/offapi/com/sun/star/document/LockedOnSavingRequest.idl
+++ b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_LockedOnSavingRequest_idl__
#define __com_sun_star_document_LockedOnSavingRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 1332d016d4d3..f12956e360e8 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -27,37 +27,14 @@
#ifndef __com_sun_star_document_MediaDescriptor_idl__
#define __com_sun_star_document_MediaDescriptor_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
#include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/NoSuchFilterRequest.idl b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
index fc92c27c06e9..b34df0de235d 100644
--- a/offapi/com/sun/star/document/NoSuchFilterRequest.idl
+++ b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_NoSuchFilterRequest_idl__
#define __com_sun_star_document_NoSuchFilterRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
index afb96812e6f3..5646d0c322c3 100644
--- a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
#define __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
-#ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
index b47abb27aeda..dac2965d40be 100644
--- a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
+++ b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_OleEmbeddedServerRegistration_idl__
#define __com_sun_star_document_OleEmbeddedServerRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
index c2448f65ab42..85d6f4dff713 100644
--- a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
+++ b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_OwnLockOnDocumentRequest_idl__
#define __com_sun_star_document_OwnLockOnDocumentRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
index 6de6e05497c1..381c2abe7061 100644
--- a/offapi/com/sun/star/document/PDFDialog.idl
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_PDFDialog_idl__
#define __com_sun_star_document_PDFDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
#include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/Settings.idl b/offapi/com/sun/star/document/Settings.idl
index 6ba5d049b3e3..dde78877a68e 100644
--- a/offapi/com/sun/star/document/Settings.idl
+++ b/offapi/com/sun/star/document/Settings.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_document_Settings_idl__
#define __com_sun_star_document_Settings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
index 9b9ed2f7cb9a..2c8465ed7630 100644
--- a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_StandaloneDocumentInfo_idl__
#define __com_sun_star_document_StandaloneDocumentInfo_idl__
-#ifndef __com_sun_star_document_DocumentInfo_idl__
#include <com/sun/star/document/DocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
#include <com/sun/star/document/XStandaloneDocumentInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/TypeDetection.idl b/offapi/com/sun/star/document/TypeDetection.idl
index 608398873adc..29b0ed7552b1 100644
--- a/offapi/com/sun/star/document/TypeDetection.idl
+++ b/offapi/com/sun/star/document/TypeDetection.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_TypeDetection_idl__
#define __com_sun_star_document_TypeDetection_idl__
-#ifndef __com_sun_star_document_XTypeDetection_idl__
#include <com/sun/star/document/XTypeDetection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XActionLockable.idl b/offapi/com/sun/star/document/XActionLockable.idl
index 62add1717cd8..caaa4372f960 100644
--- a/offapi/com/sun/star/document/XActionLockable.idl
+++ b/offapi/com/sun/star/document/XActionLockable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XActionLockable_idl__
#define __com_sun_star_document_XActionLockable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XBinaryStreamResolver.idl b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
index 5b754eba3670..c14ead0aaf37 100644
--- a/offapi/com/sun/star/document/XBinaryStreamResolver.idl
+++ b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_document_XBinaryStreamResolver_idl__
#define __com_sun_star_document_XBinaryStreamResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XOututStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XCodeNameQuery.idl b/offapi/com/sun/star/document/XCodeNameQuery.idl
index ea64bef9dea8..6c3c992e32e8 100644
--- a/offapi/com/sun/star/document/XCodeNameQuery.idl
+++ b/offapi/com/sun/star/document/XCodeNameQuery.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_document_XCodeNameQuery_idl__
#define __com_sun_star_document_XCodeNameQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
index ef99ae350284..48b25b977923 100644
--- a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
+++ b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
#define __com_sun_star_document_XCompatWriterDocProperties_idl__
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
#include <com/sun/star/document/XDocumentProperties.idl>
-#endif
//=============================================================================
module com { module sun { module star { module document {
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 7885f9cde7da..ae7e62a8e416 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
#define __com_sun_star_document_XDocumentEventBroadcaster_idl__
-#ifndef __com_sun_star_frame_XController2_idl__
#include <com/sun/star/frame/XController2.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
#include <com/sun/star/document/DocumentEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index bcaa6ecd8321..7033b5968529 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XDocumentEventListener_idl__
#define __com_sun_star_document_XDocumentEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
#include <com/sun/star/document/DocumentEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentInfo.idl b/offapi/com/sun/star/document/XDocumentInfo.idl
index ea67495f44b9..c656a8e0467e 100644
--- a/offapi/com/sun/star/document/XDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XDocumentInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XDocumentInfo_idl__
#define __com_sun_star_document_XDocumentInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
#include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
index ceb17d1bcc5b..20e6b5107bad 100644
--- a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XDocumentInfoSupplier_idl__
#define __com_sun_star_document_XDocumentInfoSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
#include <com/sun/star/document/XDocumentInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentInsertable.idl b/offapi/com/sun/star/document/XDocumentInsertable.idl
index 60208ee05014..4956a0cfd760 100644
--- a/offapi/com/sun/star/document/XDocumentInsertable.idl
+++ b/offapi/com/sun/star/document/XDocumentInsertable.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_document_XDocumentInsertable_idl__
#define __com_sun_star_document_XDocumentInsertable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentLanguages.idl b/offapi/com/sun/star/document/XDocumentLanguages.idl
index c6f17125d050..a12f4b4720df 100644
--- a/offapi/com/sun/star/document/XDocumentLanguages.idl
+++ b/offapi/com/sun/star/document/XDocumentLanguages.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_XDocumentLanguages_idl__
#define __com_sun_star_document_XDocumentLanguages_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentProperties.idl b/offapi/com/sun/star/document/XDocumentProperties.idl
index acc895f484d1..79a07b9d9fca 100644
--- a/offapi/com/sun/star/document/XDocumentProperties.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_document_XDocumentProperties_idl__
#define __com_sun_star_document_XDocumentProperties_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_WrongFormatException_idl__
#include <com/sun/star/io/WrongFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 811513d7a026..1ebee0672208 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XDocumentPropertiesSupplier_idl__
#define __com_sun_star_document_XDocumentPropertiesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
#include <com/sun/star/document/XDocumentProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
index 991b54fa84a9..ae6b1f83e4dd 100644
--- a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
#define __com_sun_star_document_XDocumentRevisionListPersistence_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_util_RevisionTag_idl__
#include <com/sun/star/util/RevisionTag.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/io/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index be5121bf2e2a..0c7831a8d68a 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
#define __com_sun_star_document_XDocumentSubStorageSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
index f1b31dd21d90..efa62d36e25a 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XEmbeddedObjectResolver_idl__
#define __com_sun_star_document_XEmbeddedObjectResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
index 1885121705dd..edc1f3858cda 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
#define __com_sun_star_document_XEmbeddedObjectSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
index 32d959cb3944..5e5903e49d75 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
#define __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
#include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
#include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedScripts.idl b/offapi/com/sun/star/document/XEmbeddedScripts.idl
index f8f14c4b3319..a3ab23fa7b91 100644
--- a/offapi/com/sun/star/document/XEmbeddedScripts.idl
+++ b/offapi/com/sun/star/document/XEmbeddedScripts.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_document_XEmbeddedScripts_idl__
#define __com_sun_star_document_XEmbeddedScripts_idl__
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
#include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEventBroadcaster.idl b/offapi/com/sun/star/document/XEventBroadcaster.idl
index ff4240b028ee..995c341d1f73 100644
--- a/offapi/com/sun/star/document/XEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XEventBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#define __com_sun_star_document_XEventBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventListener_idl__
#include <com/sun/star/document/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEventListener.idl b/offapi/com/sun/star/document/XEventListener.idl
index d32b04ced66f..4cbc64dd6e96 100644
--- a/offapi/com/sun/star/document/XEventListener.idl
+++ b/offapi/com/sun/star/document/XEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XEventListener_idl__
#define __com_sun_star_document_XEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_EventObject_idl__
#include <com/sun/star/document/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XEventsSupplier.idl b/offapi/com/sun/star/document/XEventsSupplier.idl
index d5bd2b0d9aa9..44d3669b9482 100644
--- a/offapi/com/sun/star/document/XEventsSupplier.idl
+++ b/offapi/com/sun/star/document/XEventsSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XEventsSupplier_idl__
#define __com_sun_star_document_XEventsSupplier_idl__
-#ifndef __com_sun_star_container_XNameReplace_idl__
#include <com/sun/star/container/XNameReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XExporter.idl b/offapi/com/sun/star/document/XExporter.idl
index a89017c248a1..67fe3a2d2df3 100644
--- a/offapi/com/sun/star/document/XExporter.idl
+++ b/offapi/com/sun/star/document/XExporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XExporter_idl__
#define __com_sun_star_document_XExporter_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XExtendedFilterDetection.idl b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
index 70b9da4424ea..402cd4c66a22 100644
--- a/offapi/com/sun/star/document/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
#define __com_sun_star_document_XExtendedFilterDetection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/document/XFilter.idl b/offapi/com/sun/star/document/XFilter.idl
index 82bdca53dba5..a50f07cff9df 100644
--- a/offapi/com/sun/star/document/XFilter.idl
+++ b/offapi/com/sun/star/document/XFilter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XFilter_idl__
#define __com_sun_star_document_XFilter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index 877587aa0e26..dbe3f650b752 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -27,10 +27,7 @@
#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
#define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/io/XInputStream.idl>
#include <com/sun/star/io/XOutputStream.idl>
diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index 50863b04f38c..bf01b514ec80 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XGraphicObjectResolver_idl__
#define __com_sun_star_document_XGraphicObjectResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XImporter.idl b/offapi/com/sun/star/document/XImporter.idl
index 9a784aeae173..6980a7d629ff 100644
--- a/offapi/com/sun/star/document/XImporter.idl
+++ b/offapi/com/sun/star/document/XImporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XImporter_idl__
#define __com_sun_star_document_XImporter_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XInteractionFilterOptions.idl b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
index b11749297e14..27b32b5a16a2 100644
--- a/offapi/com/sun/star/document/XInteractionFilterOptions.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XInteractionFilterOptions_idl__
#define __com_sun_star_document_XInteractionFilterOptions_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XInteractionFilterSelect.idl b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
index 2e396f4aa165..374a06ec25b2 100644
--- a/offapi/com/sun/star/document/XInteractionFilterSelect.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XInteractionFilterSelect_idl__
#define __com_sun_star_document_XInteractionFilterSelect_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XLinkTargetSupplier.idl b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
index f48a68f9d429..a414a4cb6e31 100644
--- a/offapi/com/sun/star/document/XLinkTargetSupplier.idl
+++ b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
#define __com_sun_star_document_XLinkTargetSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 7766282276dd..8472330a745c 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_XMLBasicExporter_idl__
#define __com_sun_star_document_XMLBasicExporter_idl__
-#ifndef __com_sun_star_document_XExporter_idl__
#include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl b/offapi/com/sun/star/document/XMLBasicImporter.idl
index 74b789c954ed..9dfd46c78e96 100644
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicImporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XMLBasicImporter_idl__
#define __com_sun_star_document_XMLBasicImporter_idl__
-#ifndef __com_sun_star_document_XImporter_idl__
#include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index b5817e99e8ee..fbc47fbf3589 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_XMLOasisBasicExporter_idl__
#define __com_sun_star_document_XMLOasisBasicExporter_idl__
-#ifndef __com_sun_star_document_XExporter_idl__
#include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index c77c6395a9be..684fe1d6abe9 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XMLOasisBasicImporter_idl__
#define __com_sun_star_document_XMLOasisBasicImporter_idl__
-#ifndef __com_sun_star_document_XImporter_idl__
#include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XMimeTypeInfo.idl b/offapi/com/sun/star/document/XMimeTypeInfo.idl
index fd3345f75c48..c634c1846758 100644
--- a/offapi/com/sun/star/document/XMimeTypeInfo.idl
+++ b/offapi/com/sun/star/document/XMimeTypeInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
#define __com_sun_star_document_XMimeTypeInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
index 62c459de9091..cb2ae988156b 100644
--- a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
#define __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
#include <com/sun/star/document/XDocumentProperties.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XRedlinesSupplier.idl b/offapi/com/sun/star/document/XRedlinesSupplier.idl
index 6ce6b825e04e..bfbf47885a6d 100644
--- a/offapi/com/sun/star/document/XRedlinesSupplier.idl
+++ b/offapi/com/sun/star/document/XRedlinesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XRedlinesSupplier_idl__
#define __com_sun_star_document_XRedlinesSupplier_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XScriptInvocationContext.idl b/offapi/com/sun/star/document/XScriptInvocationContext.idl
index 82bae58d9712..c7f495bb738c 100644
--- a/offapi/com/sun/star/document/XScriptInvocationContext.idl
+++ b/offapi/com/sun/star/document/XScriptInvocationContext.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_document_XScriptInvocationContext_idl__
-#ifndef __com_sun_star_document_XEmbeddedScripts_idl__
#include <com/sun/star/document/XEmbeddedScripts.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
index cf09472df795..cb7ebb4ce5e4 100644
--- a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
#define __com_sun_star_document_XStandaloneDocumentInfo_idl__
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
#include <com/sun/star/document/XDocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 047320b43df4..6152bafed78b 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
#define __com_sun_star_embed_XStorageBasedDocument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStorageChangeListener_idl__
#include <com/sun/star/document/XStorageChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 2272132f8db2..9054813c254e 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_document_XStorageChangeListener_idl__
#define __com_sun_star_document_XStorageChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XTypeDetection.idl b/offapi/com/sun/star/document/XTypeDetection.idl
index ce89b437edb8..45de3b0eb07a 100644
--- a/offapi/com/sun/star/document/XTypeDetection.idl
+++ b/offapi/com/sun/star/document/XTypeDetection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_document_XTypeDetection_idl__
#define __com_sun_star_document_XTypeDetection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index 1be11dd9897f..18ead9138513 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -29,9 +29,7 @@
#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
#define __org_openoffice_vba_XVbaMethodParameter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/document/XViewDataSupplier.idl b/offapi/com/sun/star/document/XViewDataSupplier.idl
index 0a27b906f358..aa8e8c511719 100644
--- a/offapi/com/sun/star/document/XViewDataSupplier.idl
+++ b/offapi/com/sun/star/document/XViewDataSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_XViewDataSupplier_idl__
#define __com_sun_star_document_XViewDataSupplier_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 03eac077f6c2..4c96c86cc692 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index 06ba915d6e0e..dd5722de6151 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
#include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index 1a6464f3ef18..c7a3c3a2ac17 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_AccessibleImageBullet_idl__
#define __com_sun_star_drawing_AccessibleImageBullet_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
#include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 5c958f844fe3..daf85f9f3b1f 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 2d306eaf20ee..5991e2f34427 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#define __com_sun_star_drawing_AccessibleShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 661ace660bc4..430b8bad7263 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index b03d1583f0f2..400bdc074c2d 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 04129448d94c..4aaa8d4ebc13 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_AppletShape_idl__
#define __com_sun_star_drawing_AppletShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Background.idl b/offapi/com/sun/star/drawing/Background.idl
index 7625ef293370..b76eda938330 100644
--- a/offapi/com/sun/star/drawing/Background.idl
+++ b/offapi/com/sun/star/drawing/Background.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Background_idl__
#define __com_sun_star_drawing_Background_idl__
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index c74c3179b7d3..a17baa2c9fd2 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BezierPoint_idl__
#define __com_sun_star_drawing_BezierPoint_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 1ef488e87438..3a25dc540397 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BitmapTable_idl__
#define __com_sun_star_drawing_BitmapTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 706eaccecd96..841816d62913 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BoundVolume_idl__
#define __com_sun_star_drawing_BoundVolume_idl__
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 3d235e8a336f..7db515f070b0 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_drawing_CameraGeometry_idl__
#define __com_sun_star_drawing_CameraGeometry_idl__
-#ifndef __com_sun_star_drawing_Direction3D_idl__
#include <com/sun/star/drawing/Direction3D.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index ad02bab728db..2fb314045204 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_drawing_CaptionShape_idl__
#define __com_sun_star_drawing_CaptionShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 4fd5c2ca5974..68e7cad7eea1 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_drawing_ClosedBezierShape_idl__
#define __com_sun_star_drawing_ClosedBezierShape_idl__
-#ifndef __com_sun_star_drawing_LineShape_idl__
#include <com/sun/star/drawing/LineShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index db86fca96f7a..97ddbc4d8ef4 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#define __com_sun_star_drawing_ConnectorProperties_idl__
-#ifndef __com_sun_star_drawing_ConnectorType_idl__
#include <com/sun/star/drawing/ConnectorType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index d76bea93345f..96de4be3925c 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_ConnectorShape_idl__
#define __com_sun_star_drawing_ConnectorShape_idl__
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__
#include <com/sun/star/drawing/XConnectorShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index 43055b54d26d..5e3acc31bdb0 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_ControlShape_idl__
#define __com_sun_star_drawing_ControlShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XControlShape_idl__
#include <com/sun/star/drawing/XControlShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index e0bed624f8fe..4038b741601a 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_CoordinateSequenceSequence_idl__
#define __com_sun_star_drawing_CoordinateSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_CoordinateSequence_idl__
#include <com/sun/star/drawing/CoordinateSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CustomShape.idl b/offapi/com/sun/star/drawing/CustomShape.idl
index 4ec4dbf7bf92..9a54c61101d7 100644
--- a/offapi/com/sun/star/drawing/CustomShape.idl
+++ b/offapi/com/sun/star/drawing/CustomShape.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_drawing_CustomShape_idl__
#define __com_sun_star_drawing_CustomShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CustomShapeEngine.idl b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
index 6df041ce1948..aa0b5d26c066 100644
--- a/offapi/com/sun/star/drawing/CustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_CustomShapeEngine_idl__
#define __com_sun_star_drawing_CustomShapeEngine_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
#include <com/sun/star/drawing/XCustomShapeEngine.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index 84c42b794f93..5a4bd611272d 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DashTable_idl__
#define __com_sun_star_drawing_DashTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 948b8c769649..480475804d13 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_drawing_Defaults_idl__
#define __com_sun_star_drawing_Defaults_idl__
-#ifndef __com_sun_star_drawing_TextProperties_idl__
#include <com/sun/star/drawing/TextProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DocumentSettings.idl b/offapi/com/sun/star/drawing/DocumentSettings.idl
index 99b45e2868a7..a4301c73fc42 100644
--- a/offapi/com/sun/star/drawing/DocumentSettings.idl
+++ b/offapi/com/sun/star/drawing/DocumentSettings.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_DocumentSettings_idl__
#define __com_sun_star_drawing_DocumentSettings_idl__
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
#include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index f825d4805031..752a4a92381b 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
#define __com_sun_star_drawing_DoubleSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_DoubleSequence_idl__
#include <com/sun/star/drawing/DoubleSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index 44d534362e84..d9b3d07ccdd6 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_drawing_DrawPage_idl__
#define __com_sun_star_drawing_DrawPage_idl__
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
#include <com/sun/star/drawing/XMasterPageTarget.idl>
-#endif
-
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index f65fac91c79e..e2097ed19546 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_DrawPages_idl__
#define __com_sun_star_drawing_DrawPages_idl__
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
#include <com/sun/star/drawing/XDrawPageSummarizer.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
#include <com/sun/star/drawing/XDrawPageExpander.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index f0335dbd4c10..bb27dc3fa696 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DrawingDocument_idl__
#define __com_sun_star_drawing_DrawingDocument_idl__
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
#include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index 4ca85ff8a1be..2cbf24e11880 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -27,37 +27,18 @@
#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
#define __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
module com { module sun { module star { module view {
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index a07fba53ab8e..41bbd29afdb5 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index cdcbb7cf8676..4f3abe119b5e 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_EllipseShape_idl__
#define __com_sun_star_drawing_EllipseShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_CircleKind_idl__
#include <com/sun/star/drawing/CircleKind.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index f6a755e15827..09947838378e 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
index c34304f03d18..4e4b60a23717 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_Direction3D_idl__
#include <com/sun/star/drawing/Direction3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__
#include <com/sun/star/drawing/ProjectionMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadeMode_idl__
#include <com/sun/star/drawing/ShadeMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
index 385d5f113d40..b7f2c3366395 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeHandle.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
index d5e8420fc32f..b6e96863decd 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
index b454950bf1fe..b9b865c229fe 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
index d0bd22cafb5a..6d9279d6c13f 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapePath_idl__
#define __com_sun_star_drawing_EnhancedCustomShapePath_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeSegment_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
index a1a8ca12b51f..502e48c075aa 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
index e9bbd2c71962..47dc73b9af90 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
index 72674e8a3974..0cae956201ee 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index 44f0fa3a944a..d3048ce69d3a 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_drawing_FillProperties_idl__
#define __com_sun_star_drawing_FillProperties_idl__
-#ifndef __com_sun_star_drawing_FillStyle_idl__
#include <com/sun/star/drawing/FillStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Gradient_idl__
#include <com/sun/star/awt/Gradient.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Hatch_idl__
#include <com/sun/star/drawing/Hatch.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
#include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
#include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index a2fcfe27dfc7..0650291e2e35 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_FlagSequence_idl__
#define __com_sun_star_drawing_FlagSequence_idl__
-#ifndef __com_sun_star_drawing_PolygonFlags_idl__
#include <com/sun/star/drawing/PolygonFlags.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 5be60e2a1fb1..1e12941c3dc2 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
#define __com_sun_star_drawing_FlagSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_FlagSequence_idl__
#include <com/sun/star/drawing/FlagSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index b9663e552348..a9151db4f5df 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -27,41 +27,23 @@
#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#define __com_sun_star_drawing_GenericDrawPage_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
#include <com/sun/star/drawing/XShapeCombiner.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__
#include <com/sun/star/drawing/XShapeBinder.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__
#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index b500adb9ca97..3d3fb1ac3598 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -27,49 +27,17 @@
#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
#define __com_sun_star_drawing_GenericDrawingDocument_idl__
-#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
#include <com/sun/star/drawing/XDrawPageDuplicator.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
#include <com/sun/star/drawing/XMasterPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
#include <com/sun/star/drawing/XLayerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index 83cfb638d35f..10f613adaa16 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GluePoint_idl__
#define __com_sun_star_drawing_GluePoint_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index 5169add58450..c8ae986bf94a 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_GluePoint2_idl__
#define __com_sun_star_drawing_GluePoint2_idl__
-#ifndef __com_sun_star_drawing_Alignment_idl__
#include <com/sun/star/drawing/Alignment.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__
#include <com/sun/star/drawing/EscapeDirection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index a8c3b67f4d12..bd9840712da0 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GradientTable_idl__
#define __com_sun_star_drawing_GradientTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 97351fceaa55..490e9bf49193 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_GraphicExportFilter_idl__
#define __com_sun_star_drawing_GraphicExportFilter_idl__
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XExporter_idl__
#include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
#include <com/sun/star/document/XMimeTypeInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
index dda216a78785..cbe407c9986d 100644
--- a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
+++ b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GraphicFilterRequest_idl__
#define __com_sun_star_drawing_GraphicFilterRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index de53e4b6c490..282e8f091886 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -27,37 +27,19 @@
#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
#define __com_sun_star_drawing_GraphicObjectShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_drawing_ColorMode_idl__
#include <com/sun/star/drawing/ColorMode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 4aa717692517..2ba5b322c01f 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_drawing_GroupShape_idl__
#define __com_sun_star_drawing_GroupShape_idl__
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index a71a1485682c..69f7266641b3 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_Hatch_idl__
#define __com_sun_star_drawing_Hatch_idl__
-#ifndef __com_sun_star_drawing_HatchStyle_idl__
#include <com/sun/star/drawing/HatchStyle.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index c96a474fb596..b65859b6041b 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HatchTable_idl__
#define __com_sun_star_drawing_HatchTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index ac7e24ae0524..51f64cfb300d 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix_idl__
#define __com_sun_star_drawing_HomogenMatrix_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__
#include <com/sun/star/drawing/HomogenMatrixLine.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index 1584b2841f47..510d55cb3152 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
#define __com_sun_star_drawing_HomogenMatrix3_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__
#include <com/sun/star/drawing/HomogenMatrixLine3.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index c1fa0d1cabd0..d7e2b0c77a65 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix4_idl__
#define __com_sun_star_drawing_HomogenMatrix4_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__
#include <com/sun/star/drawing/HomogenMatrixLine4.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index a8a4476966eb..8e2533f3c748 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Layer_idl__
#define __com_sun_star_drawing_Layer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index ebcad6a021a8..7c5dd0530055 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_LayerManager_idl__
#define __com_sun_star_drawing_LayerManager_idl__
-#ifndef __com_sun_star_drawing_XLayerManager_idl__
#include <com/sun/star/drawing/XLayerManager.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index 3ffe6a0576cb..91727c775f1e 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_LineDash_idl__
#define __com_sun_star_drawing_LineDash_idl__
-#ifndef __com_sun_star_drawing_DashStyle_idl__
#include <com/sun/star/drawing/DashStyle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 364400d8c800..d0628a7fbe75 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_drawing_LineProperties_idl__
#define __com_sun_star_drawing_LineProperties_idl__
-#ifndef __com_sun_star_drawing_LineStyle_idl__
#include <com/sun/star/drawing/LineStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
#include <com/sun/star/drawing/LineDash.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineJoint_idl__
#include <com/sun/star/drawing/LineJoint.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index 8a98f94a6056..c2988b556d48 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_LineShape_idl__
#define __com_sun_star_drawing_LineShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index 0303c5573616..1b59d17be9b8 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MarkerTable_idl__
#define __com_sun_star_drawing_MarkerTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a56fc6d219c4..fc3a70a46621 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MasterPage_idl__
#define __com_sun_star_drawing_MasterPage_idl__
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index 6c7ab4c8b9ce..b2c73e8e3eb2 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MasterPages_idl__
#define __com_sun_star_drawing_MasterPages_idl__
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index ab02f5605e91..055423545195 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#define __com_sun_star_drawing_MeasureProperties_idl__
-#ifndef __com_sun_star_drawing_MeasureKind_idl__
#include <com/sun/star/drawing/MeasureKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
#include <com/sun/star/drawing/MeasureTextHorzPos.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
#include <com/sun/star/drawing/MeasureTextVertPos.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index 7422b2d51d79..7e21158a2885 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_MeasureShape_idl__
#define __com_sun_star_drawing_MeasureShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 01d823cef417..2ff047194b7d 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_OLE2Shape_idl__
#define __com_sun_star_drawing_OLE2Shape_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index db5c91e6a2a6..4008c634539b 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_OpenBezierShape_idl__
#define __com_sun_star_drawing_OpenBezierShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index 097d24eb867a..c36be42c32b1 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PageShape_idl__
#define __com_sun_star_drawing_PageShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index f1db802fa19e..3e595cee8f06 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_PluginShape_idl__
#define __com_sun_star_drawing_PluginShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index 6d74d8ee3306..d415d1f3289e 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PointSequence_idl__
#define __com_sun_star_drawing_PointSequence_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index 518751635173..511397e167a0 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#define __com_sun_star_drawing_PointSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_PointSequence_idl__
#include <com/sun/star/drawing/PointSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index c8ddb5a1e051..797cac70e440 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_PolyLineShape_idl__
#define __com_sun_star_drawing_PolyLineShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index c1766e64c00e..659d1825d242 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
#include <com/sun/star/drawing/FlagSequenceSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index 30a338374880..bad769cb8ccf 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 98717dfb7d1c..3a4d15562159 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__
#define __com_sun_star_drawing_PolyPolygonBezierShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index ef09abc22ec8..5f907c424204 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#define __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index 86f00b31103b..18921c6f2ce6 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_PolyPolygonShape_idl__
#define __com_sun_star_drawing_PolyPolygonShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 721839255774..e49df0ef183f 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__
#define __com_sun_star_drawing_PolyPolygonShape3D_idl__
-#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
#include <com/sun/star/drawing/DoubleSequenceSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 173df05c8c47..2a75d405520b 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_drawing_RectangleShape_idl__
#define __com_sun_star_drawing_RectangleShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index 9ecb450b0a2e..0cb105339c99 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#define __com_sun_star_drawing_ShadowProperties_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index 152035324b8b..867c47f1c5f4 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -27,37 +27,14 @@
#ifndef __com_sun_star_drawing_Shape_idl__
#define __com_sun_star_drawing_Shape_idl__
-#ifndef __com_sun_star_document_LinkTarget_idl__
#include <com/sun/star/document/LinkTarget.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
#include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
#include <com/sun/star/drawing/XGluePointsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
index df633e334cb2..0195d5896715 100644
--- a/offapi/com/sun/star/drawing/ShapeCollection.idl
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_ShapeCollection_idl__
#define __com_sun_star_drawing_ShapeCollection_idl__
-#ifndef __com_sun_star_drawing_Shapes_idl__
#include <com/sun/star/drawing/Shapes.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index e6c1663df2e0..db5daec0a0f6 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Shapes_idl__
#define __com_sun_star_drawing_Shapes_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/SlideRenderer.idl b/offapi/com/sun/star/drawing/SlideRenderer.idl
index 7607829ed338..fe4af524934d 100644
--- a/offapi/com/sun/star/drawing/SlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/SlideRenderer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_SlideRenderer_idl__
#define __com_sun_star_drawing_SlideRenderer_idl__
-#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
#include <com/sun/star/drawing/XSlideRenderer.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index b5af6a596a04..b497917592dd 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_drawing_SlideSorter_idl__
#define __com_sun_star_drawing_SlideSorter_idl__
-#ifndef __com_sun_star_drawing_framework_XView_idl__
#include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index cb9b0c182afd..cbafa06a4862 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_Text_idl__
#define __com_sun_star_drawing_Text_idl__
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextProperties_idl__
#include <com/sun/star/drawing/TextProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index 34c0ab2b6955..38b9b017bab3 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -27,61 +27,27 @@
#ifndef __com_sun_star_drawing_TextProperties_idl__
#define __com_sun_star_drawing_TextProperties_idl__
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
#include <com/sun/star/drawing/TextFitToSizeType.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
#include <com/sun/star/drawing/TextAdjust.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
#include <com/sun/star/drawing/TextAnimationDirection.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
#include <com/sun/star/drawing/TextAnimationKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
#include <com/sun/star/drawing/TextVerticalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
#include <com/sun/star/drawing/TextHorizontalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode_idl__
#include <com/sun/star/text/WritingMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index e1b8d23fbd1d..ef84a73266b3 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -27,29 +27,15 @@
#ifndef __com_sun_star_drawing_TextShape_idl__
#define __com_sun_star_drawing_TextShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index b1686ce0c16d..7049f87fe1cf 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__
#define __com_sun_star_drawing_TransparencyGradientTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index 12132d75c7fa..c9f790713e0b 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XConnectableShape_idl__
#define __com_sun_star_drawing_XConnectableShape_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
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 2cc777ebc2f4..63fb3c6dbc47 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XConnectorShape_idl__
#define __com_sun_star_drawing_XConnectorShape_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__
#include <com/sun/star/drawing/XConnectableShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_ConnectionType_idl__
#include <com/sun/star/drawing/ConnectionType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 2607f082b3d7..21c1c9933635 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XControlShape_idl__
#define __com_sun_star_drawing_XControlShape_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
index 4bc2aa287066..691b56c5b130 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
#define __com_sun_star_drawing_XCustomShapeEngine_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
#include <com/sun/star/drawing/XCustomShapeHandle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
index 9d0ce5e87c71..fd47ae6b4e10 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
#define __com_sun_star_drawing_XCustomShapeHandle_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
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 93ec75f7ea5f..f8cba41cdece 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XDrawPage_idl__
#define __com_sun_star_drawing_XDrawPage_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index 515d83ac9bc2..e7a19e2b199e 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
#define __com_sun_star_drawing_XDrawPageDuplicator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index 306379ea9a3b..0fe1a7a7ead2 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
#define __com_sun_star_drawing_XDrawPageExpander_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 780a484d0783..c670da819484 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
#define __com_sun_star_drawing_XDrawPageSummarizer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 6804c0411271..96cf7d42fd5a 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
#define __com_sun_star_drawing_XDrawPageSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index 63e4518e1e44..16160477b34f 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPages_idl__
#define __com_sun_star_drawing_XDrawPages_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index fcc749269ef7..bd5bc521b07f 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#define __com_sun_star_drawing_XDrawPagesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawSubController.idl b/offapi/com/sun/star/drawing/XDrawSubController.idl
index 6c1f86dce440..90940d65ac96 100644
--- a/offapi/com/sun/star/drawing/XDrawSubController.idl
+++ b/offapi/com/sun/star/drawing/XDrawSubController.idl
@@ -28,19 +28,11 @@
#ifndef __com_sun_star_drawing_XDrawSubController_idl__
#define __com_sun_star_drawing_XDrawSubController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index de6fd0bbc7c3..3f6eebae66dd 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawView_idl__
#define __com_sun_star_drawing_XDrawView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
index f69951d20f21..ae84f75ae3df 100644
--- a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
+++ b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
#define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 6fd8b7a8db24..56d1cef089dd 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
#define __com_sun_star_drawing_XGluePointsSupplier_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 2a4f1941f0cd..e54d45c4cf84 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XLayer_idl__
#define __com_sun_star_drawing_XLayer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 3c20758b9b0b..f47c7d53d925 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XLayerManager_idl__
#define __com_sun_star_drawing_XLayerManager_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XLayer_idl__
#include <com/sun/star/drawing/XLayer.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index 3c5bcfdbd3b8..a4e4530829fc 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
#define __com_sun_star_drawing_XLayerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index 04dcab906881..472099c3a98c 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
#define __com_sun_star_drawing_XMasterPageTarget_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index 77d7fd1238dc..e8efee3edaf6 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
#define __com_sun_star_drawing_XMasterPagesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index d1a2d5d3e176..e1a749040bd2 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_XPresenterHelper_idl__
#define __com_sun_star_drawing_XPresenterHelper_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XSelectionFunction.idl b/offapi/com/sun/star/drawing/XSelectionFunction.idl
index 5e7abe8b1d42..159f41ece68e 100644
--- a/offapi/com/sun/star/drawing/XSelectionFunction.idl
+++ b/offapi/com/sun/star/drawing/XSelectionFunction.idl
@@ -27,37 +27,15 @@
#ifndef __com_sun_star_drawing_XSelectionFunction_idl__
#define __com_sun_star_drawing_XSelectionFunction_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.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
-
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
#include <com/sun/star/awt/XMouseMotionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
#include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index f5ba5579ee30..1b7eca9396ec 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShape_idl__
#define __com_sun_star_drawing_XShape_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.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_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index a3eda14c62b8..a13180ab47ef 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeAligner_idl__
#define __com_sun_star_drawing_XShapeAligner_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_Alignment_idl__
#include <com/sun/star/drawing/Alignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 18ca895d33f9..13e700dbd201 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShapeArranger_idl__
#define __com_sun_star_drawing_XShapeArranger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_Arrangement_idl__
#include <com/sun/star/drawing/Arrangement.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index 5a3de4e501ab..5a45008c9208 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeBinder_idl__
#define __com_sun_star_drawing_XShapeBinder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index a98279d40f8a..535f0968bdbb 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
#define __com_sun_star_drawing_XShapeCombiner_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index dbadb01be765..e748c3d19f7b 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#define __com_sun_star_drawing_XShapeDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 66013be4bacb..bf2e24f18aa0 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#define __com_sun_star_drawing_XShapeGroup_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index a5474b35a5d7..505d2eb55fb8 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#define __com_sun_star_drawing_XShapeGrouper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 1a64265bd10f..6d5ee56fb13a 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShapeMirror_idl__
#define __com_sun_star_drawing_XShapeMirror_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__
#include <com/sun/star/drawing/MirrorAxis.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index b0b9c78646b5..fbe9c9dd153e 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XShapes_idl__
#define __com_sun_star_drawing_XShapes_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index ee40c5f34fa6..bc3c92e880f4 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_drawing_XSlidePreviewCache_idl__
#define __com_sun_star_drawing_XSlidePreviewCache_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
#include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XSlideRenderer.idl b/offapi/com/sun/star/drawing/XSlideRenderer.idl
index de6bcd812d2d..d18792f227a3 100644
--- a/offapi/com/sun/star/drawing/XSlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/XSlideRenderer.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
#define __com_sun_star_drawing_XSlideRenderer_idl__
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 60286c3271d6..fef14a3aab73 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
#define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index afcea77be685..7981d4900841 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
#define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 2797362aade5..697e1f9cee44 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicPaneFactory_idl__
#define __com_sun_star_drawing_framework_BasicPaneFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
index e0a1529177d1..41989e8715ce 100644
--- a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
#define __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
index ffde0f8b4cb7..a9afa50ae3ef 100644
--- a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicViewFactory_idl__
#define __com_sun_star_drawing_framework_BasicViewFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 3c070f8784a9..4b68541cb026 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
#define __com_sun_star_drawing_framework_ConfigurationController_idl__
-#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
#include <com/sun/star/drawing/framework/XConfiguration.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index f5d37a917383..7141e4b72358 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#define __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module uno { interface XInterface; }; }; }; };
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
index 39669f6337a7..0afb80f81a92 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
#define __com_sun_star_drawing_framework_ConfigurationController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
#include <com/sun/star/drawing/framework/XConfigurationController.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 3966a6fafb60..daf94314f2e6 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_ModuleController_idl__
#define __com_sun_star_drawing_framework_ModuleController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
#include <com/sun/star/drawing/framework/XModuleController.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/ResourceId.idl b/offapi/com/sun/star/drawing/framework/ResourceId.idl
index 2ec5cc1864ad..aae71e8f1af5 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceId.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
#define __com_sun_star_drawing_framework_ResourceId_idl__
-#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
#include <com/sun/star/drawing/framework/XResourceId.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index a062fcea141f..d5b067d88dc7 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
#define __com_sun_star_drawing_framework_XConfiguration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
#include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index d487786387b5..c7f19fb10be9 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
#define __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 8fff19cd27ad..39e0c58e61cb 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
#define __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index d9dbeaa77295..d9d94bc1d2f2 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
#define __com_sun_star_drawing_framework_XConfigurationController_idl__
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
#include <com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
#include <com/sun/star/drawing/framework/XResourceFactoryManager.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceActivationMode_idl__
#include <com/sun/star/drawing/framework/ResourceActivationMode.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index f46aa79587d5..50c4bafa79fb 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
#define __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index 0dde513a6c20..94496d8b45ac 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
#define __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index fba9b5f920ca..b07aeec41d14 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XControllerManager_idl__
#define __com_sun_star_drawing_framework_XControllerManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XModuleController.idl b/offapi/com/sun/star/drawing/framework/XModuleController.idl
index 475e00c349e1..25ba576011e6 100644
--- a/offapi/com/sun/star/drawing/framework/XModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/XModuleController.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
#define __com_sun_star_drawing_framework_XModuleController_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_FRAME_XCONTROLLER_IDL_
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
#include <com/sun/star/drawing/framework/ResourceId.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index ad0bc7dbb791..f6b0f06f1a69 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_framework_XPane_idl__
#define __com_sun_star_drawing_framework_XPane_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCcanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
#include <com/sun/star/drawing/framework/XRelocatableResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 85fec5a311cb..139614d7591e 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XPane2_idl__
#define __com_sun_star_drawing_framework_XPane2_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 2bcf06ac32f7..159a8cf9d37d 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
#define __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
-#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
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
index 3cc6054278b6..3152736825b5 100644
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
#define __com_sun_star_drawing_framework_XRelocatableResource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index 492249d4005c..26e8e986ef55 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XResource_idl__
#define __com_sun_star_drawing_framework_XResource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 4df12470fb64..ce3063d32f34 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
#define __com_sun_star_drawing_framework_XResourceFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 1926c38c2774..81b004012a5f 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
#define __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 6d24fbed092f..7faa637467c3 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
#define __com_sun_star_drawing_framework_XResourceId_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
#include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XTabBar.idl b/offapi/com/sun/star/drawing/framework/XTabBar.idl
index 8213b9babe0a..efdd534f3ddf 100644
--- a/offapi/com/sun/star/drawing/framework/XTabBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XTabBar.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XTabBar_idl__
#define __com_sun_star_drawing_framework_XTabBar_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_drawing_framework_TabBarButton_idl__
#include <com/sun/star/drawing/framework/TabBarButton.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl
index 364406affc7f..0146245428d5 100644
--- a/offapi/com/sun/star/drawing/framework/XToolBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XToolBar.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XToolBar_idl__
#define __com_sun_star_drawing_framework_XToolBar_idl__
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index c773cd903a00..5a34a4bff9bf 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XView_idl__
#define __com_sun_star_drawing_framework_XView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/embed/BaseStorage.idl b/offapi/com/sun/star/embed/BaseStorage.idl
index 81df39792b75..1ffe48b61583 100644
--- a/offapi/com/sun/star/embed/BaseStorage.idl
+++ b/offapi/com/sun/star/embed/BaseStorage.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_embed_BaseStorage_idl__
#define __com_sun_star_embed_BaseStorage_idl__
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/DocumentCloser.idl b/offapi/com/sun/star/embed/DocumentCloser.idl
index a9c2269b9c65..22b0892568f4 100644
--- a/offapi/com/sun/star/embed/DocumentCloser.idl
+++ b/offapi/com/sun/star/embed/DocumentCloser.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_embed_DocumentCloser_idl__
#define __com_sun_star_embed_DocumentCloser_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_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 2974a493e24e..061adb423f19 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -27,30 +27,12 @@
#ifndef __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
#define __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
#include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
#include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
-
#include <com/sun/star/embed/XStorage.idl>
//============================================================================
diff --git a/offapi/com/sun/star/embed/FileSystemStorage.idl b/offapi/com/sun/star/embed/FileSystemStorage.idl
index 2b4d7d456751..666b36e30a4f 100644
--- a/offapi/com/sun/star/embed/FileSystemStorage.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorage.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_embed_FileSystemStorage_idl__
#define __com_sun_star_embed_FileSystemStorage_idl__
-#ifndef __com_sun_star_embed_BaseStorage_idl__
#include <com/sun/star/embed/BaseStorage.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index f047913c6d2a..292725bc332f 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_embed_FileSystemStorageFactory_idl__
#define __com_sun_star_embed_FileSystemStorageFactory_idl__
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/InsertedObjectInfo.idl b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
index 8c122add8887..ffc0fe6a774d 100644
--- a/offapi/com/sun/star/embed/InsertedObjectInfo.idl
+++ b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
#define __com_sun_star_embed_InsertedObjectInfo_idl__
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
#include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/InstanceLocker.idl b/offapi/com/sun/star/embed/InstanceLocker.idl
index 3258dc3b9365..aa4d129c0977 100644
--- a/offapi/com/sun/star/embed/InstanceLocker.idl
+++ b/offapi/com/sun/star/embed/InstanceLocker.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_embed_InstanceLocker_idl__
#define __com_sun_star_embed_InstanceLocker_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_embed_XActionsApproval_idl__
#include <com/sun/star/embed/XActionsApproval.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/embed/InvalidStorageException.idl b/offapi/com/sun/star/embed/InvalidStorageException.idl
index f4eabfb8908e..d17c74d7b925 100644
--- a/offapi/com/sun/star/embed/InvalidStorageException.idl
+++ b/offapi/com/sun/star/embed/InvalidStorageException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_InvalidStorageException_idl__
#define __com_sun_star_embed_InvalidStorageException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/LinkageMisuseException.idl b/offapi/com/sun/star/embed/LinkageMisuseException.idl
index fec43851a373..fb8609fa553c 100644
--- a/offapi/com/sun/star/embed/LinkageMisuseException.idl
+++ b/offapi/com/sun/star/embed/LinkageMisuseException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_LinkageMisuseException_idl__
#define __com_sun_star_embed_LinkageMisuseException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/NeedsRunningStateException.idl b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
index 8853049ab64f..89043476734a 100644
--- a/offapi/com/sun/star/embed/NeedsRunningStateException.idl
+++ b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
#define __com_sun_star_embed_NeedsRunningStateException_idl__
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
index c5f8e5935b46..e07060e39eec 100644
--- a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
+++ b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_NoVisualAreaSizeException_idl__
#define __com_sun_star_embed_NoVisualAreaSizeException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/OLESimpleStorage.idl b/offapi/com/sun/star/embed/OLESimpleStorage.idl
index 8aa4630acd6b..c32dac81ee63 100644
--- a/offapi/com/sun/star/embed/OLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/OLESimpleStorage.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_embed_OLESimpleStorage_idl__
#define __com_sun_star_embed_OLESimpleStorage_idl__
-#ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
#include <com/sun/star/embed/XOLESimpleStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
//============================================================================
module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
index b75011033cf8..1f5befbaf019 100644
--- a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
+++ b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
#define __com_sun_star_embed_ObjectSaveVetoException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/StateChangeInProgressException.idl b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
index 648e839383ba..f46d257226bd 100644
--- a/offapi/com/sun/star/embed/StateChangeInProgressException.idl
+++ b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_StateChangeInProgressException_idl__
#define __com_sun_star_embed_StateChangeInProgressException_idl__
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 01afee9271fb..067a307f1c43 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -28,37 +28,14 @@
#ifndef __com_sun_star_embed_Storage_idl__
#define __com_sun_star_embed_Storage_idl__
-#ifndef __com_sun_star_embed_BaseStorage_idl__
#include <com/sun/star/embed/BaseStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
#include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
#include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
#include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__
#include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.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
//============================================================================
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index 6cb6584cffd0..65abbeb58d0b 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_embed_StorageFactory_idl__
#define __com_sun_star_embed_StorageFactory_idl__
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/StorageStream.idl b/offapi/com/sun/star/embed/StorageStream.idl
index 53f5ccdefb78..2edcb26d0d49 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_embed_StorageStream_idl__
#define __com_sun_star_embed_StorageStream_idl__
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
#include <com/sun/star/embed/XEncryptionProtectedSource.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_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
#include <com/sun/star/io/XSeekable.idl>
-#endif
diff --git a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
index aed449eb90a1..b6eaed500801 100644
--- a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
+++ b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
#define __com_sun_star_embed_StorageWrappedTargetException_idl__
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/UnreachableStateException.idl b/offapi/com/sun/star/embed/UnreachableStateException.idl
index be53beda3bc3..88401160ebee 100644
--- a/offapi/com/sun/star/embed/UnreachableStateException.idl
+++ b/offapi/com/sun/star/embed/UnreachableStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_UnreachableStateException_idl__
#define __com_sun_star_embed_UnreachableStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/UseBackupException.idl b/offapi/com/sun/star/embed/UseBackupException.idl
index 4f362aeb6fa1..ccddb2d8b87f 100644
--- a/offapi/com/sun/star/embed/UseBackupException.idl
+++ b/offapi/com/sun/star/embed/UseBackupException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_UseBackupException_idl__
#define __com_sun_star_embed_UseBackupException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/VisualRepresentation.idl b/offapi/com/sun/star/embed/VisualRepresentation.idl
index 8d07575008bb..251fd9fef8c3 100644
--- a/offapi/com/sun/star/embed/VisualRepresentation.idl
+++ b/offapi/com/sun/star/embed/VisualRepresentation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_VisualRepresentation_idl__
#define __com_sun_star_embed_VisualRepresentation_idl__
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/WrongStateException.idl b/offapi/com/sun/star/embed/WrongStateException.idl
index 809389c3a1fa..103d5b476c5b 100644
--- a/offapi/com/sun/star/embed/WrongStateException.idl
+++ b/offapi/com/sun/star/embed/WrongStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_WrongStateException_idl__
#define __com_sun_star_embed_WrongStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XActionsApproval.idl b/offapi/com/sun/star/embed/XActionsApproval.idl
index d3b64367a97b..5d4722e1c583 100644
--- a/offapi/com/sun/star/embed/XActionsApproval.idl
+++ b/offapi/com/sun/star/embed/XActionsApproval.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_XActionsApproval_idl__
#define __com_sun_star_embed_XActionsApproval_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XClassifiedObject.idl b/offapi/com/sun/star/embed/XClassifiedObject.idl
index 2cde70fa8566..bc54afdfeff8 100644
--- a/offapi/com/sun/star/embed/XClassifiedObject.idl
+++ b/offapi/com/sun/star/embed/XClassifiedObject.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XClassifiedObject_idl__
#define __com_sun_star_embed_XClassifiedObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 65db0b125428..eb591ec66447 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
#define __com_sun_star_embed_XCommonEmbedPersist_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XComponentSupplier.idl b/offapi/com/sun/star/embed/XComponentSupplier.idl
index 548b5aa24510..84a820022ebf 100644
--- a/offapi/com/sun/star/embed/XComponentSupplier.idl
+++ b/offapi/com/sun/star/embed/XComponentSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_XComponentSupplier_idl__
#define __com_sun_star_embed_XComponentSupplier_idl__
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
index 001e74fa20f1..513159d9633b 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
#define __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
#include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index a214851922ad..a183801acc99 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_embed_XEmbedObjectCreator_idl__
#define __com_sun_star_embed_XEmbedObjectCreator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index 67a355054c48..3e7de1034cce 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_embed_XEmbedObjectFactory_idl__
#define __com_sun_star_embed_XEmbedObjectFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl b/offapi/com/sun/star/embed/XEmbedPersist.idl
index e825e6f083bf..0e73d0458c6b 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_embed_XEmbedPersist_idl__
#define __com_sun_star_embed_XEmbedPersist_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
#include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XEmbeddedClient.idl b/offapi/com/sun/star/embed/XEmbeddedClient.idl
index a1ad21498619..b6b7b12f883a 100644
--- a/offapi/com/sun/star/embed/XEmbeddedClient.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedClient.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_embed_XEmbeddedClient_idl__
#define __com_sun_star_embed_XEmbeddedClient_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
#include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
#include <com/sun/star/embed/ObjectSaveVetoException.idl>
-#endif
diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index c144a50a8261..5beb02bb9b3b 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -27,61 +27,20 @@
#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
#define __com_sun_star_embed_XEmbeddedObject_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedClient_idl__
#include <com/sun/star/embed/XEmbeddedClient.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XVisualObject_idl__
#include <com/sun/star/embed/XVisualObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
#include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
#include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
#include <com/sun/star/embed/XStateChangeBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_embed_VerbDescriptor_idl__
#include <com/sun/star/embed/VerbDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_embed_UnreachableStateException_idl__
#include <com/sun/star/embed/UnreachableStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
#include <com/sun/star/embed/NeedsRunningStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
index 9a71b99e871b..e6bf4b2fe128 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
#define __com_sun_star_embed_XEncryptionProtectedSource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index e590a5764178..5a0e5101a0d3 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
#define __com_sun_star_embed_XEncryptionProtectedSource2_idl__
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
#include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XExtendedStorageStream.idl b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
index 3cf58ce89474..0bacaaa574ac 100644
--- a/offapi/com/sun/star/embed/XExtendedStorageStream.idl
+++ b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
#define __com_sun_star_embed_XExtendedStorageStream_idl__
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
#include <com/sun/star/io/XSeekable.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
#include <com/sun/star/embed/XEncryptionProtectedSource.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_embed_XTransactedObject_idl__
#include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
#include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XHatchWindow.idl b/offapi/com/sun/star/embed/XHatchWindow.idl
index 33733958f6cd..e8438e85abc4 100644
--- a/offapi/com/sun/star/embed/XHatchWindow.idl
+++ b/offapi/com/sun/star/embed/XHatchWindow.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_embed_XHatchWindow_idl__
#define __com_sun_star_embed_XHatchWindow_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XHatchWindowController_idl__
#include <com/sun/star/embed/XHatchWindowController.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XHatchWindowController.idl b/offapi/com/sun/star/embed/XHatchWindowController.idl
index 7ec2e0c5a5bb..7f3310f60da2 100644
--- a/offapi/com/sun/star/embed/XHatchWindowController.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowController.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XHatchWindowController_idl__
#define __com_sun_star_embed_XHatchWindowController_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/embed/XHatchWindowFactory.idl b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index 79d8db04832d..eae4d0769578 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_embed_XHatchWindowFactory_idl__
#define __com_sun_star_embed_XHatchWindowFactory_idl__
-#ifndef __com_sun_star_embed_XHatchWindow_idl__
#include <com/sun/star/embed/XHatchWindow.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_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/embed/XHierarchicalStorageAccess.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
index be9dc6f765b0..95e3e79add4b 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
@@ -27,53 +27,18 @@
#ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
#define __com_sun_star_embed_XHierarchicalStorageAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
#include <com/sun/star/embed/XExtendedStorageStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
#include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
#include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
#include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
#include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
index 0df83ea33580..ca38599f54d1 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
#define __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
-#ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
#include <com/sun/star/embed/XHierarchicalStorageAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XInplaceClient.idl b/offapi/com/sun/star/embed/XInplaceClient.idl
index 7f9270a94db7..9e1312377910 100644
--- a/offapi/com/sun/star/embed/XInplaceClient.idl
+++ b/offapi/com/sun/star/embed/XInplaceClient.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_embed_XInplaceClient_idl__
#define __com_sun_star_embed_XInplaceClient_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
#include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XInplaceObject.idl b/offapi/com/sun/star/embed/XInplaceObject.idl
index 5341df1601f6..c21b9ba80c66 100644
--- a/offapi/com/sun/star/embed/XInplaceObject.idl
+++ b/offapi/com/sun/star/embed/XInplaceObject.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_embed_XInplaceObject_idl__
#define __com_sun_star_embed_XInplaceObject_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
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
diff --git a/offapi/com/sun/star/embed/XInsertObjectDialog.idl b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
index b304fd6d676e..6095d0072e76 100644
--- a/offapi/com/sun/star/embed/XInsertObjectDialog.idl
+++ b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_embed_XInsertObjectDialog_idl__
#define __com_sun_star_embed_XInsertObjectDialog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
#include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XLinkCreator.idl b/offapi/com/sun/star/embed/XLinkCreator.idl
index be4bbe613288..9671dbda6706 100644
--- a/offapi/com/sun/star/embed/XLinkCreator.idl
+++ b/offapi/com/sun/star/embed/XLinkCreator.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_embed_XLinkCreator_idl__
#define __com_sun_star_embed_XLinkCreator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XLinkFactory.idl b/offapi/com/sun/star/embed/XLinkFactory.idl
index cd77fbfe0dbb..4af985e2546b 100644
--- a/offapi/com/sun/star/embed/XLinkFactory.idl
+++ b/offapi/com/sun/star/embed/XLinkFactory.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_embed_XLinkFactory_idl__
#define __com_sun_star_embed_XLinkFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XLinkageSupport.idl b/offapi/com/sun/star/embed/XLinkageSupport.idl
index b5038b0d3fba..e52a94ab6d82 100644
--- a/offapi/com/sun/star/embed/XLinkageSupport.idl
+++ b/offapi/com/sun/star/embed/XLinkageSupport.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_embed_XLinkageSupport_idl__
#define __com_sun_star_embed_XLinkageSupport_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
#include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XOLESimpleStorage.idl b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
index 1eb5e3f3a61b..796588dfac41 100644
--- a/offapi/com/sun/star/embed/XOLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
#define __com_sun_star_embed_XOLESimpleStorage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
#include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
#include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XOptimizedStorage.idl b/offapi/com/sun/star/embed/XOptimizedStorage.idl
index 4210b9daa4ea..1d58b3ea37f3 100644
--- a/offapi/com/sun/star/embed/XOptimizedStorage.idl
+++ b/offapi/com/sun/star/embed/XOptimizedStorage.idl
@@ -27,65 +27,21 @@
#ifndef __com_sun_star_embed_XOptimizedStorage_idl__
#define __com_sun_star_embed_XOptimizedStorage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
#include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
#include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
#include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
#include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
#include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XPackageStructureCreator.idl b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
index c76d4c787cc7..35996c54c710 100644
--- a/offapi/com/sun/star/embed/XPackageStructureCreator.idl
+++ b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XPackageStructureCreator_idl__
#define __com_sun_star_embed_XPackageStructureCreator_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XPersistanceHolder.idl b/offapi/com/sun/star/embed/XPersistanceHolder.idl
index befc70f138da..7b3a94b2697e 100644
--- a/offapi/com/sun/star/embed/XPersistanceHolder.idl
+++ b/offapi/com/sun/star/embed/XPersistanceHolder.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_embed_XPersistanceHolder_idl__
#define __com_sun_star_embed_XPersistanceHolder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XRelationshipAccess.idl b/offapi/com/sun/star/embed/XRelationshipAccess.idl
index 26969b770f5e..61785c8ac342 100644
--- a/offapi/com/sun/star/embed/XRelationshipAccess.idl
+++ b/offapi/com/sun/star/embed/XRelationshipAccess.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_embed_XRelationshipAccess_idl__
#define __com_sun_star_embed_XRelationshipAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
index 91a47e8f6288..785ecc9f77d3 100644
--- a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
#define __com_sun_star_embed_XStateChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_embed_XStateChangeListener_idl__
#include <com/sun/star/embed/XStateChangeListener.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XStateChangeListener.idl b/offapi/com/sun/star/embed/XStateChangeListener.idl
index 3c552de33222..379a8ab3482a 100644
--- a/offapi/com/sun/star/embed/XStateChangeListener.idl
+++ b/offapi/com/sun/star/embed/XStateChangeListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_embed_XStateChangeListener_idl__
#define __com_sun_star_embed_XStateChangeListener_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
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XStorage.idl b/offapi/com/sun/star/embed/XStorage.idl
index 0ae6c10fc6a0..8304224704bb 100644
--- a/offapi/com/sun/star/embed/XStorage.idl
+++ b/offapi/com/sun/star/embed/XStorage.idl
@@ -27,61 +27,20 @@
#ifndef __com_sun_star_embed_XStorage_idl__
#define __com_sun_star_embed_XStorage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
#include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
#include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
#include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
#include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
#include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XStorage2.idl b/offapi/com/sun/star/embed/XStorage2.idl
index cf4f9907b66e..1cd973cfbf3a 100644
--- a/offapi/com/sun/star/embed/XStorage2.idl
+++ b/offapi/com/sun/star/embed/XStorage2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_embed_XStorage2_idl__
#define __com_sun_star_embed_XStorage2_idl__
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XStorageRawAccess.idl b/offapi/com/sun/star/embed/XStorageRawAccess.idl
index 83370f146882..c8d989aff7e9 100644
--- a/offapi/com/sun/star/embed/XStorageRawAccess.idl
+++ b/offapi/com/sun/star/embed/XStorageRawAccess.idl
@@ -27,49 +27,17 @@
#ifndef __com_sun_star_embed_XStorageRawAccess_idl__
#define __com_sun_star_embed_XStorageRawAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
#include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
#include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
#include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
#include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XTransactedObject.idl b/offapi/com/sun/star/embed/XTransactedObject.idl
index 80f86187a7c6..81f5e749304a 100644
--- a/offapi/com/sun/star/embed/XTransactedObject.idl
+++ b/offapi/com/sun/star/embed/XTransactedObject.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_embed_XTransactedObject_idl__
#define __com_sun_star_embed_XTransactedObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
index 638d015c55e8..be2927f71fac 100644
--- a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
#define __com_sun_star_embed_XTransactionBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_embed_XTransactionListener_idl__
#include <com/sun/star/embed/XTransactionListener.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index 89e80956cf11..ac355e6ceba2 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_embed_XTransactionListener_idl__
#define __com_sun_star_embed_XTransactionListener_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
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XTransferableSupplier.idl b/offapi/com/sun/star/embed/XTransferableSupplier.idl
index d22c6fb27769..83677602b984 100644
--- a/offapi/com/sun/star/embed/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/embed/XTransferableSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_XTransferableSupplier_idl__
#define __com_sun_star_embed_XTransferableSupplier_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl
index a98f4742d7a9..dc4f3563937e 100644
--- a/offapi/com/sun/star/embed/XVisualObject.idl
+++ b/offapi/com/sun/star/embed/XVisualObject.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_embed_XVisualObject_idl__
#define __com_sun_star_embed_XVisualObject_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
-
-#ifndef __com_sun_star_embed_VisualRepresentation_idl__
#include <com/sun/star/embed/VisualRepresentation.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/embed/XWindowSupplier.idl b/offapi/com/sun/star/embed/XWindowSupplier.idl
index 515ec0777151..644651120a84 100644
--- a/offapi/com/sun/star/embed/XWindowSupplier.idl
+++ b/offapi/com/sun/star/embed/XWindowSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_embed_XWindowSupplier_idl__
#define __com_sun_star_embed_XWindowSupplier_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index 8d7be2db024f..7ca7944f6659 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#define __com_sun_star_form_DataAwareControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index adad03001091..e34bb91307cf 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__
#define __com_sun_star_form_DatabaseDeleteEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index f933f612e345..1a1c53e10b4f 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#define __com_sun_star_form_DatabaseParameterEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index b5267df0c7b5..dffba943fe0e 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_ErrorEvent_idl__
#define __com_sun_star_form_ErrorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index bb48e67df44d..56dcf480e0d5 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_form_FormComponent_idl__
#define __com_sun_star_form_FormComponent_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyBag_idl__
#include <com/sun/star/beans/PropertyBag.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index e29b162f6087..32feb2da0b2f 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -27,22 +27,10 @@
#ifndef __com_sun_star_form_FormComponents_idl__
#define __com_sun_star_form_FormComponents_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
#include <com/sun/star/script/XEventAttacherManager.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index c0cbc6051a75..e8d1ab415ffe 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_FormControlModel_idl__
#define __com_sun_star_form_FormControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f14fd5181355..ef4dd8bc1928 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -27,49 +27,23 @@
#ifndef __com_sun_star_form_FormController_idl__
#define __com_sun_star_form_FormController_idl__
-#ifndef __com_sun_star_form_XFormController_idl__
#include <com/sun/star/form/XFormController.idl>
-#endif
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#include <com/sun/star/form/XConfirmDeleteBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
#include <com/sun/star/sdb/XSQLErrorBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
#include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#include <com/sun/star/form/FormControllerDispatcher.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index e277f95c9949..652a16647472 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#define __com_sun_star_form_FormControllerDispatcher_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index 533113d4aafd..567b4336f48e 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_form_Forms_idl__
#define __com_sun_star_form_Forms_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 18650aea09cc..180c4c45d684 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_form_PropertyBrowserController_idl__
#define __com_sun_star_form_PropertyBrowserController_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index ef53896fd501..7ce0bd7f3899 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#define __com_sun_star_form_XApproveActionBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
#include <com/sun/star/form/XApproveActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index f35ef82ba509..4cd630bbef15 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionListener_idl__
#define __com_sun_star_form_XApproveActionListener_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/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 8a64b441f58a..df7c209c7a6c 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundComponent_idl__
#define __com_sun_star_form_XBoundComponent_idl__
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#include <com/sun/star/form/XUpdateBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 549e091ab1b5..5831888ad8fe 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundControl_idl__
#define __com_sun_star_form_XBoundControl_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index e67f288c0433..ba74a34d8654 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#define __com_sun_star_form_XChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeListener_idl__
#include <com/sun/star/form/XChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index 341ab4090466..c09a98a47921 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeListener_idl__
#define __com_sun_star_form_XChangeListener_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/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index bf38373c2f49..85ab19b3a09f 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#include <com/sun/star/form/XConfirmDeleteListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index b65eb95e4f07..c30fb45d41d1 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#define __com_sun_star_form_XConfirmDeleteListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index d73d1d4f9116..6644871c1c1b 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#include <com/sun/star/form/XDatabaseParameterListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 28448b136be9..acf6c8c44d1a 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 38cd22bbee3f..c673d48a1cd3 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#define __com_sun_star_form_XDatabaseParameterListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#include <com/sun/star/form/DatabaseParameterEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index 3ba5fb10a456..95e86dd12d6a 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDeleteListener_idl__
#define __com_sun_star_form_XDeleteListener_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/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 5a6ac34f031b..7f9baaa9eb90 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorBroadcaster_idl__
#define __com_sun_star_form_XErrorBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XErrorListener_idl__
#include <com/sun/star/form/XErrorListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 6deca2e9ba7c..5b5877d87504 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorListener_idl__
#define __com_sun_star_form_XErrorListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_ErrorEvent_idl__
#include <com/sun/star/form/ErrorEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index 4fc0daaf427a..2c65b6a54b43 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XForm_idl__
#define __com_sun_star_form_XForm_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index 7d32c30deef1..24fe4996c9fd 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XFormComponent_idl__
#define __com_sun_star_form_XFormComponent_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index e78de565f7ce..47835242e42d 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XFormController_idl__
#define __com_sun_star_form_XFormController_idl__
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
#include <com/sun/star/form/XFormControllerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 0efe13153c19..ec61cb3d493d 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormControllerListener_idl__
#define __com_sun_star_form_XFormControllerListener_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/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 121ee9ffac8b..c342d3462ead 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormsSupplier_idl__
#define __com_sun_star_form_XFormsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 30a22e02b91c..b0ab96e52d91 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_XFormsSupplier2_idl__
#define __com_sun_star_form_XFormsSupplier2_idl__
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index f60fa5be9cee..b1aec8c904fd 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XGrid_idl__
#define __com_sun_star_form_XGrid_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 76d1b3735b9f..ae44b6a15c9d 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#define __com_sun_star_form_XGridColumnFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 96bb954036f7..7c6202a37c5f 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#define __com_sun_star_form_XGridFieldDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index 57d815caa214..08cca59f9994 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridPeer_idl__
#define __com_sun_star_form_XGridPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 74a52e8e526c..312f5c78159d 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#define __com_sun_star_form_XImageProducerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XImageProducer_idl__
#include <com/sun/star/awt/XImageProducer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index 4cdec9ee5f1b..9d107289551f 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XInsertListener_idl__
#define __com_sun_star_form_XInsertListener_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/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index 5b3caa7bd92a..101f9c26c84a 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadListener_idl__
#define __com_sun_star_form_XLoadListener_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/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 1c1abb68059c..01363e892064 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadable_idl__
#define __com_sun_star_form_XLoadable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index 610379ed7a62..653922f6a510 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XPositioningListener_idl__
#define __com_sun_star_form_XPositioningListener_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/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 9ae85bab8c93..7173c38ef66a 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XReset_idl__
#define __com_sun_star_form_XReset_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XResetListener_idl__
#include <com/sun/star/form/XResetListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index 0f86a3822b74..3806d5868283 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XResetListener_idl__
#define __com_sun_star_form_XResetListener_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/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index 9469eaa382ea..a64142113cd7 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XRestoreListener_idl__
#define __com_sun_star_form_XRestoreListener_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/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index 1772b32c1982..1511c3267bd5 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_XSubmit_idl__
#define __com_sun_star_form_XSubmit_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
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmitListener_idl__
#include <com/sun/star/form/XSubmitListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index 832a1a4896d1..f2396a60cff8 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XSubmitListener_idl__
#define __com_sun_star_form_XSubmitListener_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/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index cf4f20a4da69..908fcbb95b39 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#define __com_sun_star_form_XUpdateBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XUpdateListener_idl__
#include <com/sun/star/form/XUpdateListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 1d6dc15bb76a..b058369e91f3 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateListener_idl__
#define __com_sun_star_form_XUpdateListener_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/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index 8b0d1058c77b..ec889e1d12ac 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#define __com_sun_star_form_binding_BindableControlModel_idl__
-#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#include <com/sun/star/form/binding/XBindableValue.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index 684d78b3c9c4..3569a692348d 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#define __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index d7eeb255164d..8a06b3590d97 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#include <com/sun/star/form/component/DatabaseCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index 9c379190afcc..bb1dd78886ef 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#include <com/sun/star/form/component/DatabaseComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2df7988e5d40..acf6a05e8c30 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseDateField_idl__
#define __com_sun_star_form_binding_BindableDatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#include <com/sun/star/form/component/DatabaseDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index c6f433339295..b4ad3a6e85a5 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
#define __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#include <com/sun/star/form/component/DatabaseFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index d07665579638..c2ee16193a16 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseListBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#include <com/sun/star/form/component/DatabaseListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index c34acbe14ce1..e56243f40407 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
#define __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#include <com/sun/star/form/component/DatabaseNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index b22b2af24951..e8c5dd5b806d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
#define __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#include <com/sun/star/form/component/DatabaseRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 81906b7759a5..4c3d67e2db9d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTextField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#include <com/sun/star/form/component/DatabaseTextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index fafa1a06a507..8dd842d34117 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#include <com/sun/star/form/component/DatabaseTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 478c6875f717..6a27ee71b10b 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_BindableIntegerValueRange_idl__
#define __com_sun_star_form_binding_BindableIntegerValueRange_idl__
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 4f0b6551e973..066c4e030060 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#define __com_sun_star_form_binding_IncompatibleTypesException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index d25f6159e88b..30c42840f0fe 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#define __com_sun_star_form_binding_InvalidBindingStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index d5911ffec37a..dfcc76d97055 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#define __com_sun_star_form_binding_ListEntryEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index 0ac3452e2737..6bce223367c2 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
#define __com_sun_star_form_binding_ListEntrySource_idl__
-#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#include <com/sun/star/form/binding/XListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index 36bdf4ec9e03..b05192924df4 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_ValueBinding_idl__
#define __com_sun_star_form_binding_ValueBinding_idl__
-#ifndef __com_sun_star_util_XValueBinding_idl__
#include <com/sun/star/form/binding/XValueBinding.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 2d8413029323..192cd2dbecb5 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#define __com_sun_star_form_binding_XBindableValue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index b48ec45198fc..2d2d244f8f52 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XListEntryListener_idl__
#define __com_sun_star_form_binding_XListEntryListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#include <com/sun/star/form/binding/ListEntryEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index 0f2e84a8011d..8e910d6415fb 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_XListEntrySink_idl__
#define __com_sun_star_form_binding_XListEntrySink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index ea39e18875ab..242b211ee4be 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#define __com_sun_star_form_binding_XListEntrySource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 207b3ec7e7ad..4c49932f793e 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_XValueBinding_idl__
#define __com_sun_star_form_binding_XValueBinding_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#include <com/sun/star/form/binding/InvalidBindingStateException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index 5db7acb3d2a6..bcf5072c0a4f 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_CheckBox_idl__
#define __com_sun_star_form_component_CheckBox_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
#include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c5d02077cad8..7b3155703838 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ComboBox_idl__
#define __com_sun_star_form_component_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
#include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 1e190f2ae1ca..163f6375d96c 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_CurrencyField_idl__
#define __com_sun_star_form_component_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
#include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index 1a17ae0525e1..e52dcc9b418e 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_form_component_DataForm_idl__
#define __com_sun_star_form_component_DataForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
#include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
#include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
#include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
#include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
#include <com/sun/star/awt/TabControllerModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index 82f49ad55d02..508195af437f 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#define __com_sun_star_form_component_DatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_CheckBox_idl__
#include <com/sun/star/form/component/CheckBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 7a921f004093..e5f2c8b3edd0 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#define __com_sun_star_form_component_DatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_ComboBox_idl__
#include <com/sun/star/form/component/ComboBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index 3d56099c31d7..7421d716ff24 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
#define __com_sun_star_form_component_DatabaseCurrencyField_idl__
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
#include <com/sun/star/form/component/CurrencyField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 8673636874b0..b4ff715315cc 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#define __com_sun_star_form_component_DatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DateField_idl__
#include <com/sun/star/form/component/DateField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 575ad5d8ff02..9b402401eb52 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#define __com_sun_star_form_component_DatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_FormattedField_idl__
#include <com/sun/star/form/component/FormattedField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index 731a27437bf5..6325517fff61 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
#define __com_sun_star_form_component_DatabaseImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index dbd96f31e985..a93fe0c9032e 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#define __com_sun_star_form_component_DatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_ListBox_idl__
#include <com/sun/star/form/component/ListBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index 57853d6ddc83..8f138d7f2ee0 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#define __com_sun_star_form_component_DatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_NumericField_idl__
#include <com/sun/star/form/component/NumericField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index 2488b4160cad..04b11ccb0f09 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabasePatternField_idl__
#define __com_sun_star_form_component_DatabasePatternField_idl__
-#ifndef __com_sun_star_form_component_PatternField_idl__
#include <com/sun/star/form/component/PatternField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index 2b60c3fb5dd3..982119f1a080 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#define __com_sun_star_form_component_DatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_RadioButton_idl__
#include <com/sun/star/form/component/RadioButton.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 001f342d3c53..036deac327df 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#define __com_sun_star_form_component_DatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_TextField_idl__
#include <com/sun/star/form/component/TextField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 1ac3d51ccc36..0bd5ecf0ec31 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#define __com_sun_star_form_component_DatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_TimeField_idl__
#include <com/sun/star/form/component/TimeField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index b7764c8ea874..dca52c109763 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DateField_idl__
#define __com_sun_star_form_component_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
#include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index d9956c7114b6..c5006ac6880f 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FileControl_idl__
#define __com_sun_star_form_component_FileControl_idl__
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
#include <com/sun/star/awt/UnoControlFileControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 1bb60c47388e..84a796d9f46d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_FixedText_idl__
#define __com_sun_star_form_component_FixedText_idl__
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
#include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 526a2febecb0..c72e5b4a42a8 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_form_component_Form_idl__
#define __com_sun_star_form_component_Form_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index 99ea2c4cd3d3..08ec5b9767eb 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FormattedField_idl__
#define __com_sun_star_form_component_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
#include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index d5e61c377b69..925a8ed992dc 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
#ifndef __com_sun_star_form_component_GridControl_idl__
#define __com_sun_star_form_component_GridControl_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index d4f2b57375ae..6d9fcfff51fe 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_GroupBox_idl__
#define __com_sun_star_form_component_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
#include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 763f388a4185..95f725713f26 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_HTMLForm_idl__
#define __com_sun_star_form_component_HTMLForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmit_idl__
#include <com/sun/star/form/XSubmit.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
#include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
#include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index cf516df86d12..9b758b4e6dfd 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_component_HiddenControl_idl__
#define __com_sun_star_form_component_HiddenControl_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 69df0e295106..8f789ef56200 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_ImageButton_idl__
#define __com_sun_star_form_component_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
-#ifndef __com_sun_star_form_FormButtonType_idl__
#include <com/sun/star/form/FormButtonType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index f636d25b77ee..d1a4fc4537e2 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ListBox_idl__
#define __com_sun_star_form_component_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
#include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index 762782827cf9..2be8ff59cc36 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_component_NavigationToolBar_idl__
#define __com_sun_star_form_component_NavigationToolBar_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index 62336316eb0a..9abf804f964d 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_NumericField_idl__
#define __com_sun_star_form_component_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
#include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index f41a12d2231e..22187b2749d8 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_PatternField_idl__
#define __com_sun_star_form_component_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
#include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 76575e3450bd..a38c86594f2f 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_RadioButton_idl__
#define __com_sun_star_form_component_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
#include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 0566f658a197..086a8dc455bf 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_component_RichTextControl_idl__
#define __com_sun_star_form_component_RichTextControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
#include <com/sun/star/text/TextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 69e0fc7e78ff..81248839641c 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_ScrollBar_idl__
#define __com_sun_star_form_component_ScrollBar_idl__
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
#include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 09be77ed47c3..8323ab7854fe 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SpinButton_idl__
#define __com_sun_star_form_component_SpinButton_idl__
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
#include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index b540065cb989..6330c455677f 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SubmitButton_idl__
#define __com_sun_star_form_component_SubmitButton_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
#include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index bb4cf5ce046c..9cc34b6c77b1 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_form_component_TextField_idl__
#define __com_sun_star_form_component_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
#include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index 22cf529ead70..a3aee8eb856e 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_TimeField_idl__
#define __com_sun_star_form_component_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
#include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index 763e8ec9132c..0cd41a120679 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_component_checkbox_idl__
#define __com_sun_star_form_component_checkbox_idl__
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
#include <com/sun/star/awt/UnoControlCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index b4dbfac27509..de8444eb4231 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ComboBox_idl__
#define __com_sun_star_form_control_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
#include <com/sun/star/awt/UnoControlComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index d4a4b48356ad..5105d902b3b9 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CommandButton_idl__
#define __com_sun_star_form_control_CommandButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 203278150878..ad5f7a980eba 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CurrencyField_idl__
#define __com_sun_star_form_control_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
#include <com/sun/star/awt/UnoControlCurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ead9d296fb0e..49da27029784 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_DateField_idl__
#define __com_sun_star_form_control_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__
#include <com/sun/star/awt/UnoControlDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index f40453a4d1e9..95607506b2d6 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_FormattedField_idl__
#define __com_sun_star_form_control_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
#include <com/sun/star/awt/UnoControlFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index ef90c6ec06da..dc298031636e 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_form_control_GridControl_idl__
#define __com_sun_star_form_control_GridControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGrid_idl__
#include <com/sun/star/form/XGrid.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#include <com/sun/star/form/XGridFieldDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeSelector_idl__
#include <com/sun/star/util/XModeSelector.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 5466f2c19c59..b83a76dca57e 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_GroupBox_idl__
#define __com_sun_star_form_control_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
#include <com/sun/star/awt/UnoControlGroupBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 278de5ca515d..6c9461098469 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageButton_idl__
#define __com_sun_star_form_control_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index 10ef14cdf60b..873ddaa2f4c0 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageControl_idl__
#define __com_sun_star_form_control_ImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 40dbe0b2b25f..db14a209c0b0 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
#define __com_sun_star_form_component_InteractionGridControl_idl__
-#ifndef __com_sun_star_form_control_GridControl_idl__
#include <com/sun/star/form/control/GridControl.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index b830a2b3d045..8f5575a21fad 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_control_ListBox_idl__
#define __com_sun_star_form_control_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__
#include <com/sun/star/awt/UnoControlListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index 7f792a221a34..192c222ce4f6 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_control_NavigationToolBar_idl__
#define __com_sun_star_form_control_NavigationToolBar_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index b088f6a782eb..8167da7f0e10 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_NumericField_idl__
#define __com_sun_star_form_control_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
#include <com/sun/star/awt/UnoControlNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index 8c373702bd34..467651633ba8 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_PatternField_idl__
#define __com_sun_star_form_control_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
#include <com/sun/star/awt/UnoControlPatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index b600885453a8..8c4a242f4d02 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_RadioButton_idl__
#define __com_sun_star_form_control_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
#include <com/sun/star/awt/UnoControlRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index a0174a45f673..548585375f3c 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_SubmitButton_idl__
#define __com_sun_star_form_control_SubmitButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
#include <com/sun/star/form/submission/XSubmission.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index c16b4d969932..ec6be0816607 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_form_control_TextField_idl__
#define __com_sun_star_form_control_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index 20cd540c82a2..e28e4b197a00 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_TimeField_idl__
#define __com_sun_star_form_control_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
#include <com/sun/star/awt/UnoControlTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 99145dc4f036..6f131220f967 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
#define __com_sun_star_form_ButtonNavigationHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 609f087f71f1..5fac8099e578 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
#define __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index 11140ee20476..52304087bb3e 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
#define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index c46ef7603b31..b803837c35f5 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_EditPropertyHandler_idl__
#define __com_sun_star_form_inspection_EditPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 3940c082af22..2330573ab930 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_EventHandler_idl__
#define __com_sun_star_form_EventHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 3b51ba36b6ac..d280442aa6c8 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
#define __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index 449368af6a1a..d415949bd9a4 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
#define __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 654e17a21ba4..f4aa43fec4de 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
#define __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 6896225cfbdd..e3919919b38c 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
#define __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index c96844ded821..2572ae86f962 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_runtime_FormOperations_idl__
#define __com_sun_star_form_runtime_FormOperations_idl__
-#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#include <com/sun/star/form/runtime/XFormOperations.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index 0f1ca0df7578..4754b9c3a196 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
#define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index c41c081d58e6..ab108b732f2e 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -28,31 +28,14 @@
#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#define __com_sun_star_form_runtime_XFormOperations_idl__
-#ifndef __com_sun_star_form_runtime_FeatureState_idl__
#include <com/sun/star/form/runtime/FeatureState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
#include <com/sun/star/sdbc/XResultSetUpdate.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index d39bb19258d8..976259f36c7d 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_form_submission_XSubmission_idl__
#define __com_sun_star_form_submission_XSubmission_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 8132bfcdf1ac..7c723b11b618 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#define __com_sun_star_form_submission_XSubmissionSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index 0c9f32f5fa91..f64567d33f0c 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_submission_XSubmissionVetoListener_idl__
#define __com_sun_star_form_submission_XSubmissionVetoListener_idl__
-#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/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index 9b436b605efa..cd7e3d7ae890 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
-#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#include <com/sun/star/form/validation/ValidatableControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
module com { module sun { module star { module form { module validation {
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index 5ca51efdab1f..09b6e4490c6a 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#include <com/sun/star/form/validation/XValidatableFormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#include <com/sun/star/form/validation/XValidityConstraintListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index f28c054918b9..92ba6fb4630d 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XFormComponentValidityListener_idl__
#define __com_sun_star_form_validation_XFormComponentValidityListener_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
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index aa7799dfff85..a386584ff299 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidatable_idl__
#define __com_sun_star_form_validation_XValidatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index 75690ab349e0..adf36adf380b 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#define __com_sun_star_form_validation_XValidatableFormComponent_idl__
-#ifndef __com_sun_star_form_validation_XValidatable_idl__
#include <com/sun/star/form/validation/XValidatable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 00cbb99aa5d5..ea4e4003bb9e 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidator_idl__
#define __com_sun_star_form_validation_XValidator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index 593b230f6d52..299808f57618 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#define __com_sun_star_form_validation_XValidityConstraintListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index 98099f32ca27..b164c4e5453d 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_formula_AccessibleFormulaText_idl__
#define __com_sun_star_formula_AccessibleFormulaText_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 3cbcf84950a5..887be948b74d 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_formula_AccessibleFormulaView__
#define __com_sun_star_formula_AccessibleFormulaView__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Components.idl b/offapi/com/sun/star/frame/Components.idl
index f265161053c8..b630949a00d6 100644
--- a/offapi/com/sun/star/frame/Components.idl
+++ b/offapi/com/sun/star/frame/Components.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_Components_idl__
#define __com_sun_star_frame_Components_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ContentHandler.idl b/offapi/com/sun/star/frame/ContentHandler.idl
index 3a4655d40391..58f29c01ae0b 100644
--- a/offapi/com/sun/star/frame/ContentHandler.idl
+++ b/offapi/com/sun/star/frame/ContentHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_ContentHandler_idl__
#define __com_sun_star_frame_ContentHandler_idl__
-#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
#include <com/sun/star/frame/XNotifyingDispatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index dab4a6a6f0c1..c800d19d279d 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_ContentHandlerFactory_idl__
#define __com_sun_star_frame_ContentHandlerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index 9be9a6948349..58cac6e3c4b8 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -28,9 +28,7 @@
#define __com_sun_star_frame_ControlCommand_idl__
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index b6fa0198e1e4..4ae0bc1a18f8 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_frame_ControlEvent_idl__
#define __com_sun_star_frame_ControlEvent_idl__
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Controller.idl b/offapi/com/sun/star/frame/Controller.idl
index 53fd6e6951b1..298249d1d44c 100644
--- a/offapi/com/sun/star/frame/Controller.idl
+++ b/offapi/com/sun/star/frame/Controller.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_frame_Controller_idl__
#define __com_sun_star_frame_Controller_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
#include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUserInputInterception_idl__
#include <com/sun/star/awt/XUserInputInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
#include <com/sun/star/datatransfer/XTransferableSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl
index 96a1c8fb07b4..9c534cbe7ee1 100644
--- a/offapi/com/sun/star/frame/Desktop.idl
+++ b/offapi/com/sun/star/frame/Desktop.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_Desktop_idl__
#define __com_sun_star_frame_Desktop_idl__
-#ifndef __com_sun_star_frame_Frame_idl__
#include <com/sun/star/frame/Frame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
#include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XComponentLoader_idl__
#include <com/sun/star/frame/XComponentLoader.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DesktopTask.idl b/offapi/com/sun/star/frame/DesktopTask.idl
index 3640f57c332f..a6f9de46fc17 100644
--- a/offapi/com/sun/star/frame/DesktopTask.idl
+++ b/offapi/com/sun/star/frame/DesktopTask.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_frame_DesktopTask_idl__
#define __com_sun_star_frame_DesktopTask_idl__
-#ifndef __com_sun_star_frame_XDesktopTask_idl__
#include <com/sun/star/frame/XDesktopTask.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XWindowArranger_idl__
#include <com/sun/star/frame/XWindowArranger.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#include <com/sun/star/frame/XFramesSupplier.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
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DesktopTasks.idl b/offapi/com/sun/star/frame/DesktopTasks.idl
index afb479209b3d..34bdfccc9859 100644
--- a/offapi/com/sun/star/frame/DesktopTasks.idl
+++ b/offapi/com/sun/star/frame/DesktopTasks.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DesktopTasks_idl__
#define __com_sun_star_frame_DesktopTasks_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index 71b3ae345a6a..1aaaf9593740 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
#define __com_sun_star_frame_DispatchDescriptor_idl__
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 973b08628e44..4047eadb0b41 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchHelper_idl__
#define __com_sun_star_frame_DispatchHelper_idl__
-#ifndef __com_sun_star_frame_XDispatchHelper_idl__
#include <com/sun/star/frame/XDispatchHelper.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index 861699f018e7..fadd3db939bb 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchInformation_idl__
#define __com_sun_star_frame_DispatchInformation_idl__
-#ifndef __com_sun_star_frame_CommandGroup_idl__
#include <com/sun/star/frame/CommandGroup.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchProvider.idl b/offapi/com/sun/star/frame/DispatchProvider.idl
index 5ec66602055e..de33c6cfda69 100644
--- a/offapi/com/sun/star/frame/DispatchProvider.idl
+++ b/offapi/com/sun/star/frame/DispatchProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_DispatchProvider_idl__
#define __com_sun_star_frame_DispatchProvider_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index b41cd52367d4..56a693fd25c7 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_DispatchRecorder_idl__
#define __com_sun_star_frame_DispatchRecorder_idl__
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index cf5624cfe3fb..6e476eeecbf2 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchRecorderSupplier_idl__
#define __com_sun_star_frame_DispatchRecorderSupplier_idl__
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchResultEvent.idl b/offapi/com/sun/star/frame/DispatchResultEvent.idl
index 467342211894..6bd95e340bd2 100644
--- a/offapi/com/sun/star/frame/DispatchResultEvent.idl
+++ b/offapi/com/sun/star/frame/DispatchResultEvent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
#define __com_sun_star_frame_DispatchResultEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index c1965b0db838..c27f8cf004b8 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchStatement_idl__
#define __com_sun_star_frame_DispatchStatement_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index b3c44ffe83ad..2912a7ef8087 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DocumentTemplates_idl__
#define __com_sun_star_frame_DocumentTemplates_idl__
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index f1121156a2cc..d225770b6e83 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FeatureStateEvent.idl b/offapi/com/sun/star/frame/FeatureStateEvent.idl
index c812424e42ac..ae58f8d62766 100644
--- a/offapi/com/sun/star/frame/FeatureStateEvent.idl
+++ b/offapi/com/sun/star/frame/FeatureStateEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
#define __com_sun_star_frame_FeatureStateEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index 8c7a480e71d0..794eb1beeb70 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_frame_Frame_idl__
#define __com_sun_star_frame_Frame_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
#include <com/sun/star/task/XStatusIndicatorFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
#include <com/sun/star/frame/XDispatchInformationProvider.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl
index 46a4b481437e..27cc6acdad34 100644
--- a/offapi/com/sun/star/frame/FrameActionEvent.idl
+++ b/offapi/com/sun/star/frame/FrameActionEvent.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameActionEvent_idl__
#define __com_sun_star_frame_FrameActionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameAction_idl__
#include <com/sun/star/frame/FrameAction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index 54ccbcb888b4..b163fcd2062e 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_FrameControl_idl__
#define __com_sun_star_frame_FrameControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameLoader.idl b/offapi/com/sun/star/frame/FrameLoader.idl
index 3baa26e5e8d6..f2799135a99c 100644
--- a/offapi/com/sun/star/frame/FrameLoader.idl
+++ b/offapi/com/sun/star/frame/FrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameLoader_idl__
#define __com_sun_star_frame_FrameLoader_idl__
-#ifndef __com_sun_star_frame_XFrameLoader_idl__
#include <com/sun/star/frame/XFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index 98bc7f16b9f0..f911a4358759 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameLoaderFactory_idl__
#define __com_sun_star_frame_FrameLoaderFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FramesContainer.idl b/offapi/com/sun/star/frame/FramesContainer.idl
index 450da0ac0538..9fe185c5397f 100644
--- a/offapi/com/sun/star/frame/FramesContainer.idl
+++ b/offapi/com/sun/star/frame/FramesContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_FramesContainer_idl__
#define __com_sun_star_frame_FramesContainer_idl__
-#ifndef __com_sun_star_frame_XFrames_idl__
#include <com/sun/star/frame/XFrames.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
index 23c98809acbd..7f0ce10ccac0 100644
--- a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_GlobalEventBroadcaster_idl__
#define __com_sun_star_frame_GlobalEventBroadcaster_idl__
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
#include <com/sun/star/document/XEventsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 2154daac70fe..a0bef818d0fd 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index e54df74e59d3..92d987892e60 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_frame_LayoutManager_idl__
#define __com_sun_star_frame_LayoutManager_idl__
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
#include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrameActionListener_idl__
#include <com/sun/star/frame/XFrameActionListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XInplaceLayout_idl__
#include <com/sun/star/frame/XInplaceLayout.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
#include <com/sun/star/frame/XMenuBarMergingAcceptor.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index cb1bd009afe3..53084a1f11eb 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_MediaTypeDetectionHelper_idl__
#define __com_sun_star_frame_MediaTypeDetectionHelper_idl__
-#ifndef __com_sun_star_util_XStringMapping_idl__
#include <com/sun/star/util/XStringMapping.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index ab8bff22d72e..5ed478d959f7 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_ModuleManager_idl__
#define __com_sun_star_frame_ModuleManager_idl__
-#ifndef __com_sun_star_frame_XModuleManager_idl__
#include <com/sun/star/frame/XModuleManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index 1c2cf9381b38..bf2b83d84869 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -28,26 +28,11 @@
#ifndef __com_sun_star_frame_PopupMenuController_idl__
#define __com_sun_star_frame_PopupMenuController_idl__
-#ifndef __com_sun_star_frame_XPopupMenuController_idl__
#include <com/sun/star/frame/XPopupMenuController.idl>
-#endif
-
-#ifndef _com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 3c8d2babc495..78b3937f5c7f 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_PopupMenuControllerFactory_idl__
#define __com_sun_star_frame_PopupMenuControllerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ProtocolHandler.idl b/offapi/com/sun/star/frame/ProtocolHandler.idl
index 3d56efd20b0a..85e629d679fe 100644
--- a/offapi/com/sun/star/frame/ProtocolHandler.idl
+++ b/offapi/com/sun/star/frame/ProtocolHandler.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_ProtocolHandler_idl__
#define __com_sun_star_frame_ProtocolHandler_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/SessionManager.idl b/offapi/com/sun/star/frame/SessionManager.idl
index 71a56e011928..06d73679216f 100644
--- a/offapi/com/sun/star/frame/SessionManager.idl
+++ b/offapi/com/sun/star/frame/SessionManager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_SessionManager_idl__
#define __com_sun_star_frame_SessionManager_idl__
-#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
#include <com/sun/star/frame/XSessionManagerClient.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Settings.idl b/offapi/com/sun/star/frame/Settings.idl
index 81a2a6a857d4..4f9365c6bac6 100644
--- a/offapi/com/sun/star/frame/Settings.idl
+++ b/offapi/com/sun/star/frame/Settings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_Settings_idl__
#define __com_sun_star_frame_Settings_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 4903f3b10d63..b68a62ae6041 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_StatusbarController_idl__
#define __com_sun_star_frame_StatusbarController_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
#include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusbarController_idl__
#include <com/sun/star/frame/XStatusbarController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index dd2b756c319a..c0d9e46c33bf 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_StatusbarControllerFactory_idl__
#define __com_sun_star_frame_StatusbarControllerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
index 417bfd86afb8..51ec02d3a3a3 100644
--- a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_SynchronousFrameLoader_idl__
#define __com_sun_star_frame_SynchronousFrameLoader_idl__
-#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
#include <com/sun/star/frame/XSynchronousFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 76e7bef933a9..49dc9af232ca 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_Task_idl__
#define __com_sun_star_frame_Task_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
#include <com/sun/star/frame/XTask.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TemplateAccess.idl b/offapi/com/sun/star/frame/TemplateAccess.idl
index 29159ab2d78b..6110da1468e7 100644
--- a/offapi/com/sun/star/frame/TemplateAccess.idl
+++ b/offapi/com/sun/star/frame/TemplateAccess.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_TemplateAccess_idl__
#define __com_sun_star_frame_TemplateAccess_idl__
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TerminationVetoException.idl b/offapi/com/sun/star/frame/TerminationVetoException.idl
index 1c215b05da8b..df92e499f139 100644
--- a/offapi/com/sun/star/frame/TerminationVetoException.idl
+++ b/offapi/com/sun/star/frame/TerminationVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TitleChangedEvent.idl b/offapi/com/sun/star/frame/TitleChangedEvent.idl
index f93ef7ccc564..da0d5a820be7 100644
--- a/offapi/com/sun/star/frame/TitleChangedEvent.idl
+++ b/offapi/com/sun/star/frame/TitleChangedEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
#define __com_sun_star_frame_TitleChangedEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 4e2753125767..5d7fff1f54aa 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_frame_ToolbarController_idl__
#define __com_sun_star_frame_ToolbarController_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
#include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XToolbarController_idl__
#include <com/sun/star/frame/XToolbarController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSubToolbarController_idl__
#include <com/sun/star/frame/XSubToolbarController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 0f982fa0f4cb..576535859ff0 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
#define __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
-#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
#include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 9b3169c1dcbe..832a3090f66b 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_UnknownModuleException_idl__
#define __com_sun_star_frame_UnknownModuleException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XBorderResizeListener.idl b/offapi/com/sun/star/frame/XBorderResizeListener.idl
index c6c96dc9c7fc..2d3f9b457825 100644
--- a/offapi/com/sun/star/frame/XBorderResizeListener.idl
+++ b/offapi/com/sun/star/frame/XBorderResizeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
#define __com_sun_star_frame_XBorderResizeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_BorderWidths_idl__
#include <com/sun/star/frame/BorderWidths.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
index e6ee4b618519..8b041fcad3f3 100644
--- a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
+++ b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XBrowseHistoryRegistry_idl__
#define __com_sun_star_frame_XBrowseHistoryRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentLoader.idl b/offapi/com/sun/star/frame/XComponentLoader.idl
index 10598d06131e..1220fdac0fe5 100644
--- a/offapi/com/sun/star/frame/XComponentLoader.idl
+++ b/offapi/com/sun/star/frame/XComponentLoader.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XComponentLoader_idl__
#define __com_sun_star_frame_XComponentLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentRegistry.idl b/offapi/com/sun/star/frame/XComponentRegistry.idl
index 9a9f32541b7b..020d84848724 100644
--- a/offapi/com/sun/star/frame/XComponentRegistry.idl
+++ b/offapi/com/sun/star/frame/XComponentRegistry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XComponentRegistry_idl__
#define __com_sun_star_frame_XComponentRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
#include <com/sun/star/uno/Uik.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XConfigManager.idl b/offapi/com/sun/star/frame/XConfigManager.idl
index d46cf5696478..02a078a00f04 100644
--- a/offapi/com/sun/star/frame/XConfigManager.idl
+++ b/offapi/com/sun/star/frame/XConfigManager.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XConfigManager_idl__
#define __com_sun_star_frame_XConfigManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index c395bfcf39a1..b39de77b5c36 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XControlNotificationListener_idl__
#define __com_sun_star_frame_XControlNotificationListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_ControlEvent_idl__
#include <com/sun/star/frame/ControlEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XController.idl b/offapi/com/sun/star/frame/XController.idl
index 50d58246fb1a..3ec12169f3d8 100644
--- a/offapi/com/sun/star/frame/XController.idl
+++ b/offapi/com/sun/star/frame/XController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XController_idl__
#define __com_sun_star_frame_XController_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XControllerBorder.idl b/offapi/com/sun/star/frame/XControllerBorder.idl
index 9f8659ee8da9..dd7686a9cd0b 100644
--- a/offapi/com/sun/star/frame/XControllerBorder.idl
+++ b/offapi/com/sun/star/frame/XControllerBorder.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XControllerBorder_idl__
#define __com_sun_star_frame_XControllerBorder_idl__
-#ifndef __com_sun_star_frame_BorderWidths_idl__
#include <com/sun/star/frame/BorderWidths.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
#include <com/sun/star/frame/XBorderResizeListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktop.idl b/offapi/com/sun/star/frame/XDesktop.idl
index f054a90584d1..b5cb7b8de11d 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XDesktop_idl__
#define __com_sun_star_frame_XDesktop_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
#include <com/sun/star/frame/XTerminateListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktopTask.idl b/offapi/com/sun/star/frame/XDesktopTask.idl
index 7a1c3cdbc436..f4558286507a 100644
--- a/offapi/com/sun/star/frame/XDesktopTask.idl
+++ b/offapi/com/sun/star/frame/XDesktopTask.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDesktopTask_idl__
#define __com_sun_star_frame_XDesktopTask_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatch.idl b/offapi/com/sun/star/frame/XDispatch.idl
index b6df12b6cd51..cbecdbfc4f7a 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XDispatch_idl__
#define __com_sun_star_frame_XDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 7d58677c19b7..8816a980bb08 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchHelper_idl__
#define __com_sun_star_frame_XDispatchHelper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index a7f50d78c79c..418d6076caa0 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
#define __com_sun_star_frame_XDispatchInformationProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchInformation_idl__
#include <com/sun/star/frame/DispatchInformation.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProvider.idl b/offapi/com/sun/star/frame/XDispatchProvider.idl
index 8197d272a119..7182a23f9296 100644
--- a/offapi/com/sun/star/frame/XDispatchProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchProvider.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#define __com_sun_star_frame_XDispatchProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
#include <com/sun/star/frame/DispatchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
index da55df5c9e3b..b55b8029caf4 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#define __com_sun_star_frame_XDispatchProviderInterception_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
#include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
index 3b1ee2c16f71..076c459ee0b6 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
#define __com_sun_star_frame_XDispatchProviderInterceptor_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index c0c9b594d38b..00b0b06d81a4 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#define __com_sun_star_frame_XDispatchRecorder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index ccb9204680b0..2330e4603c03 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#define __com_sun_star_frame_XDispatchRecorderSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchResultListener.idl b/offapi/com/sun/star/frame/XDispatchResultListener.idl
index 409bd4e0206e..48276d1bb1b3 100644
--- a/offapi/com/sun/star/frame/XDispatchResultListener.idl
+++ b/offapi/com/sun/star/frame/XDispatchResultListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
#define __com_sun_star_frame_XDispatchResultListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
#include <com/sun/star/frame/DispatchResultEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDocumentTemplates.idl b/offapi/com/sun/star/frame/XDocumentTemplates.idl
index 2e327f243da7..38f7b2f89bdb 100644
--- a/offapi/com/sun/star/frame/XDocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/XDocumentTemplates.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#define __com_sun_star_frame_XDocumentTemplates_idl__
-#ifndef __com_sun_star_frame_XStorable_idl__
#include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
index b51feda6d406..a5a725d8803c 100644
--- a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XExtendedFilterDetection_idl__
#define __com_sun_star_frame_XExtendedFilterDetection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XFilterDetect.idl b/offapi/com/sun/star/frame/XFilterDetect.idl
index 5add9f5e34e9..95edf2d659ee 100644
--- a/offapi/com/sun/star/frame/XFilterDetect.idl
+++ b/offapi/com/sun/star/frame/XFilterDetect.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFilterDetect_idl__
#define __com_sun_star_frame_XFilterDetect_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrame.idl b/offapi/com/sun/star/frame/XFrame.idl
index 5b9ba31f38bf..29ab70b1f527 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrame_idl__
#define __com_sun_star_frame_XFrame_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameActionListener.idl b/offapi/com/sun/star/frame/XFrameActionListener.idl
index 52f87f960113..27e8f54c8048 100644
--- a/offapi/com/sun/star/frame/XFrameActionListener.idl
+++ b/offapi/com/sun/star/frame/XFrameActionListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrameActionListener_idl__
#define __com_sun_star_frame_XFrameActionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameActionEvent_idl__
#include <com/sun/star/frame/FrameActionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoader.idl b/offapi/com/sun/star/frame/XFrameLoader.idl
index 305313b6472d..f050f512a0d0 100644
--- a/offapi/com/sun/star/frame/XFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XFrameLoader.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XFrameLoader_idl__
#define __com_sun_star_frame_XFrameLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLoadEventListener_idl__
#include <com/sun/star/frame/XLoadEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
index 370386cc73e3..7cca75ab61f0 100644
--- a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
+++ b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XFrameLoaderQuery_idl__
#define __com_sun_star_frame_XFrameLoaderQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameSetModel.idl b/offapi/com/sun/star/frame/XFrameSetModel.idl
index d5baf6f86466..3f3dfec64ade 100644
--- a/offapi/com/sun/star/frame/XFrameSetModel.idl
+++ b/offapi/com/sun/star/frame/XFrameSetModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFrameSetModel_idl__
#define __com_sun_star_frame_XFrameSetModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrames.idl b/offapi/com/sun/star/frame/XFrames.idl
index 42a7b0eb35e8..ba13b0a71c70 100644
--- a/offapi/com/sun/star/frame/XFrames.idl
+++ b/offapi/com/sun/star/frame/XFrames.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrames_idl__
#define __com_sun_star_frame_XFrames_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFramesSupplier.idl b/offapi/com/sun/star/frame/XFramesSupplier.idl
index 6674693e8fe2..c1c44066132b 100644
--- a/offapi/com/sun/star/frame/XFramesSupplier.idl
+++ b/offapi/com/sun/star/frame/XFramesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#define __com_sun_star_frame_XFramesSupplier_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index fa2d8944f878..7748350da171 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XInplaceLayout_idl__
#define __com_sun_star_frame_XInplaceLayout_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XInterceptorInfo.idl b/offapi/com/sun/star/frame/XInterceptorInfo.idl
index e451b16d45b2..e3cf7a4df622 100644
--- a/offapi/com/sun/star/frame/XInterceptorInfo.idl
+++ b/offapi/com/sun/star/frame/XInterceptorInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XInterceptorInfo_idl__
#define __com_sun_star_frame_XInterceptorInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index b0902aa4c0e9..305751b1ff9f 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -28,37 +28,14 @@
#ifndef __com_sun_star_frame_XLayoutManager_idl__
#define __com_sun_star_frame_XLayoutManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.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_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElement_idl__
#include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_DockingArea_idl__
#include <com/sun/star/ui/DockingArea.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
#include <com/sun/star/ui/XDockingAreaAcceptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index fc7636e21e56..86ee594e9661 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
#define __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
-#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
#include <com/sun/star/frame/XLayoutManagerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 12b9af7ffb9f..2eca6d021143 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
#define __com_sun_star_frame_XLayoutManagerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLoadEventListener.idl b/offapi/com/sun/star/frame/XLoadEventListener.idl
index ab2dca90325f..8169d122a132 100644
--- a/offapi/com/sun/star/frame/XLoadEventListener.idl
+++ b/offapi/com/sun/star/frame/XLoadEventListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLoadEventListener_idl__
#define __com_sun_star_frame_XLoadEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index 073ca9a55f34..98a3df9c96c4 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XLoadable_idl__
#define __com_sun_star_frame_XLoadable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index a5c2f54676d8..50bcbf2fed33 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_LayoutManager_idl__
#define __com_sun_star_frame_LayoutManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
#include <com/sun/star/awt/XMenuBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index 500c069006ee..4d01fd2ddf12 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
#define __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XModel.idl b/offapi/com/sun/star/frame/XModel.idl
index 1f1b3df870b5..245f41dc737e 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XModel_idl__
#define __com_sun_star_frame_XModel_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index ed591fb7316a..77ed1335b032 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_frame_XModule_idl__
#define __com_sun_star_frame_XModule_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
#include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index cdc9bba41b6e..a494586178b6 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_frame_XModuleManager_idl__
#define __com_sun_star_frame_XModuleManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
#include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XNotifyingDispatch.idl b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
index 2d1a9bbc203d..7a1ac504dcdc 100644
--- a/offapi/com/sun/star/frame/XNotifyingDispatch.idl
+++ b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
#define __com_sun_star_frame_XNotifyingDispatch_idl__
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
#include <com/sun/star/frame/XDispatchResultListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index fd9e3b4c2f2e..c22d7ef6280c 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XPopupMenuController_idl__
#define __com_sun_star_frame_XPopupMenuController_idl__
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/XPopupMenu.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 95c7a9cf1ede..e8230278ec7a 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XRecordableDispatch_idl__
#define __com_sun_star_frame_XRecordableDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSessionManagerClient.idl b/offapi/com/sun/star/frame/XSessionManagerClient.idl
index 8d1f51d4632a..5609389a4e2b 100644
--- a/offapi/com/sun/star/frame/XSessionManagerClient.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerClient.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
#define __com_sun_star_frame_XSessionManagerClient_idl__
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener.idl b/offapi/com/sun/star/frame/XSessionManagerListener.idl
index 2ee33c160240..2b3d00d5f1b3 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#define __com_sun_star_frame_XSessionManagerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 233b7614ad2e..87a988bc2b5e 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener2.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XSessionManagerListener2_idl__
#define __com_sun_star_frame_XSessionManagerListener2_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XStatusListener.idl b/offapi/com/sun/star/frame/XStatusListener.idl
index 250e22c2141d..f67d6a91c0cb 100644
--- a/offapi/com/sun/star/frame/XStatusListener.idl
+++ b/offapi/com/sun/star/frame/XStatusListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XStatusListener_idl__
#define __com_sun_star_frame_XStatusListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
#include <com/sun/star/frame/FeatureStateEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index d524cb75acc6..22211830dfde 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XStatusbarController_idl__
#define __com_sun_star_frame_XStatusbarController_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XGraphics_idl__
#include <com/sun/star/awt/XGraphics.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl
index fa41f3a37f66..094b4a5fb0d6 100644
--- a/offapi/com/sun/star/frame/XStorable.idl
+++ b/offapi/com/sun/star/frame/XStorable.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XStorable_idl__
#define __com_sun_star_frame_XStorable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl
index 20043f2c5eaf..e2ee330f7606 100644
--- a/offapi/com/sun/star/frame/XStorable2.idl
+++ b/offapi/com/sun/star/frame/XStorable2.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XStorable2_idl__
#define __com_sun_star_frame_XStorable2_idl__
-#ifndef __com_sun_star_frame_XStorable_idl__
#include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index a9614e5ba04a..fdbe019edb95 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSubToolbarController_idl__
#define __com_sun_star_frame_XSubToolbarController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index daa86152ac11..ff8e21463017 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XSynchronousDispatch_idl__
#define __com_sun_star_frame_XSynchronousDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
index 5a8a723089c8..d60ffa0c392c 100644
--- a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
#define __com_sun_star_frame_XSynchronousFrameLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTask.idl b/offapi/com/sun/star/frame/XTask.idl
index f0a59b25bcb0..a2dca9d7bc81 100644
--- a/offapi/com/sun/star/frame/XTask.idl
+++ b/offapi/com/sun/star/frame/XTask.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XTask_idl__
#define __com_sun_star_frame_XTask_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTasksSupplier.idl b/offapi/com/sun/star/frame/XTasksSupplier.idl
index deb1b3cbb757..2eae9ef31598 100644
--- a/offapi/com/sun/star/frame/XTasksSupplier.idl
+++ b/offapi/com/sun/star/frame/XTasksSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XTasksSupplier_idl__
#define __com_sun_star_frame_XTasksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
#include <com/sun/star/frame/XTask.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener.idl b/offapi/com/sun/star/frame/XTerminateListener.idl
index 937e3523817b..60896f11dfae 100644
--- a/offapi/com/sun/star/frame/XTerminateListener.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XTerminateListener_idl__
#define __com_sun_star_frame_XTerminateListener_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
-
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#include <com/sun/star/frame/TerminationVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener2.idl b/offapi/com/sun/star/frame/XTerminateListener2.idl
index dfeb50fbc93e..d57c21fedc3d 100644
--- a/offapi/com/sun/star/frame/XTerminateListener2.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XTerminateListener2_idl__
#define __com_sun_star_frame_XTerminateListener2_idl__
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
#include <com/sun/star/frame/XTerminateListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 0ce06aecb8f0..d7824625fb76 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitle_idl__
#define __com_sun_star_frame_XTitle_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
index 3bc851f4a557..03d70c0db3ce 100644
--- a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitleChangeBroadcaster_idl__
#define __com_sun_star_frame_XTitleChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
#include <com/sun/star/frame/XTitleChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitleChangeListener.idl b/offapi/com/sun/star/frame/XTitleChangeListener.idl
index 8d1c4c1d8019..35e2286a511f 100644
--- a/offapi/com/sun/star/frame/XTitleChangeListener.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
#define __com_sun_star_frame_XTitleChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
#include <com/sun/star/frame/TitleChangedEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 834cb5d8c84a..623d8a517a31 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XToolbarController_idl__
#define __com_sun_star_frame_XToolbarController_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyModifier_idl__
#include <com/sun/star/awt/KeyModifier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index 9fc7172fd203..f8b67e4c3016 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
#define __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index bd880306b7bb..64553913ce0e 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#define __com_sun_star_frame_XUIControllerRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 3cace083a209..595a0ac224df 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XUntitledNumbers_idl__
#define __com_sun_star_frame_XUntitledNumbers_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUrlList.idl b/offapi/com/sun/star/frame/XUrlList.idl
index d4005ded9cd2..af6d35e104ee 100644
--- a/offapi/com/sun/star/frame/XUrlList.idl
+++ b/offapi/com/sun/star/frame/XUrlList.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XUrlList_idl__
#define __com_sun_star_frame_XUrlList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XWindowArranger.idl b/offapi/com/sun/star/frame/XWindowArranger.idl
index ed5044b9d5aa..4ebbaa0538e6 100644
--- a/offapi/com/sun/star/frame/XWindowArranger.idl
+++ b/offapi/com/sun/star/frame/XWindowArranger.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XWindowArranger_idl__
#define __com_sun_star_frame_XWindowArranger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/GalleryItem.idl b/offapi/com/sun/star/gallery/GalleryItem.idl
index c6ffec318d3f..751863faae62 100644
--- a/offapi/com/sun/star/gallery/GalleryItem.idl
+++ b/offapi/com/sun/star/gallery/GalleryItem.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_gallery_GalleryItem_idl__
#define __com_sun_star_gallery_GalleryItem_idl__
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
#include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/GalleryTheme.idl b/offapi/com/sun/star/gallery/GalleryTheme.idl
index 207aec2c73a6..ff379beacf76 100644
--- a/offapi/com/sun/star/gallery/GalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/GalleryTheme.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_gallery_GalleryTheme_idl__
#define __com_sun_star_gallery_GalleryTheme_idl__
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
#include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
index f08b8756f20f..98cad2313abf 100644
--- a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_gallery_GalleryThemeProvider_idl__
#define __com_sun_star_gallery_GalleryThemeProvider_idl__
-#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
#include <com/sun/star/gallery/XGalleryThemeProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/XGalleryItem.idl b/offapi/com/sun/star/gallery/XGalleryItem.idl
index fac404145e3b..d31f35af649e 100644
--- a/offapi/com/sun/star/gallery/XGalleryItem.idl
+++ b/offapi/com/sun/star/gallery/XGalleryItem.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_gallery_XGalleryItem_idl__
#define __com_sun_star_gallery_XGalleryItem_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/XGalleryTheme.idl b/offapi/com/sun/star/gallery/XGalleryTheme.idl
index ed8ac5230335..ff71a42738b5 100644
--- a/offapi/com/sun/star/gallery/XGalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/XGalleryTheme.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
#define __com_sun_star_gallery_XGalleryTheme_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
#include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
index c7fa2dbfdc17..91f64847e9ba 100644
--- a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
#define __com_sun_star_gallery_XGalleryThemeProvider_idl__
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
#include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/geometry/EllipticalArc.idl b/offapi/com/sun/star/geometry/EllipticalArc.idl
index 9d7d064e3bc9..4c6f2c5b0492 100644
--- a/offapi/com/sun/star/geometry/EllipticalArc.idl
+++ b/offapi/com/sun/star/geometry/EllipticalArc.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_geometry_EllipticalArc_idl__
#define __com_sun_star_geometry_EllipticalArc_idl__
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
module com { module sun { module star { module geometry {
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index 1d2465d91f8e..f36bf2b5b3d8 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_geometry_XMapping2D_idl__
#define __com_sun_star_geometry_XMapping2D_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
module com { module sun { module star { module geometry {
diff --git a/offapi/com/sun/star/graphic/XPrimitive2D.idl b/offapi/com/sun/star/graphic/XPrimitive2D.idl
index b1a8fb62f4fb..a0e62c24e598 100644
--- a/offapi/com/sun/star/graphic/XPrimitive2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive2D.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_graphic_XPrimitive2D_idl__
#define __com_sun_star_graphic_XPrimitive2D_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
module com { module sun { module star { module graphic {
diff --git a/offapi/com/sun/star/graphic/XPrimitive3D.idl b/offapi/com/sun/star/graphic/XPrimitive3D.idl
index 5083ed338a76..cbcbcd4685d7 100644
--- a/offapi/com/sun/star/graphic/XPrimitive3D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive3D.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_graphic_XPrimitive3D_idl__
#define __com_sun_star_graphic_XPrimitive3D_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle3D_idl__
#include <com/sun/star/geometry/RealRectangle3D.idl>
-#endif
module com { module sun { module star { module graphic {
diff --git a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
index 846d0c3d5154..edd26a509056 100644
--- a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_graphic_XPrimitiveFactory2D_idl__
#define __com_sun_star_graphic_XPrimitiveFactory2D_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//////////////////////////////////////////////////////////////////////////////
// predefines
diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl
index 658ce5764d76..ff9a9a65a2b1 100644
--- a/offapi/com/sun/star/i18n/BreakIterator.idl
+++ b/offapi/com/sun/star/i18n/BreakIterator.idl
@@ -28,10 +28,7 @@
#define __com_sun_star_i18n_BreakIterator_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
#include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl
index 1c903b95033d..bde28553fa01 100644
--- a/offapi/com/sun/star/i18n/CharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/CharacterClassification.idl
@@ -29,7 +29,6 @@
#define __com_sun_star_i18n_CharacterClassification_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/i18n/XCharacterClassification.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl
index 79cea254bb56..87a95b242ab3 100644
--- a/offapi/com/sun/star/i18n/Collator.idl
+++ b/offapi/com/sun/star/i18n/Collator.idl
@@ -28,10 +28,7 @@
#define __com_sun_star_i18n_Collator_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XCollator_idl__
#include <com/sun/star/i18n/XCollator.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/Currency2.idl b/offapi/com/sun/star/i18n/Currency2.idl
index e6a7cc2a5090..98a573b7a435 100644
--- a/offapi/com/sun/star/i18n/Currency2.idl
+++ b/offapi/com/sun/star/i18n/Currency2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_i18n_Currency2_idl__
#define __com_sun_star_i18n_Currency2_idl__
-#ifndef __com_sun_star_i18n_Currency_idl__
#include <com/sun/star/i18n/Currency.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
index fb58e57fc9d1..e975a70bf295 100644
--- a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
+++ b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
#define __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
#include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/LineBreakResults.idl b/offapi/com/sun/star/i18n/LineBreakResults.idl
index 00b34baeee68..35b6594372bd 100644
--- a/offapi/com/sun/star/i18n/LineBreakResults.idl
+++ b/offapi/com/sun/star/i18n/LineBreakResults.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_i18n_LineBreakResults_idl__
#define __com_sun_star_i18n_LineBreakResults_idl__
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
#include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
index f0dcd01ee0f9..54eed8478d96 100644
--- a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
+++ b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_i18n_MultipleCharsOutputException_idl__
#define __com_sun_star_i18n_MultipleCharsOutputException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversion.idl b/offapi/com/sun/star/i18n/TextConversion.idl
index f5957a6664f6..d95d4140f636 100644
--- a/offapi/com/sun/star/i18n/TextConversion.idl
+++ b/offapi/com/sun/star/i18n/TextConversion.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_i18n_TextConversion_idl__
#define __com_sun_star_i18n_TextConversion_idl__
-#ifndef __com_sun_star_i18n_XTextConversion_idl__
#include <com/sun/star/i18n/XTextConversion.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index 226687ec3d67..92260294ee77 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_i18n_XTextConversionResult_idl__
-#ifndef __com_sun_star_i18n_Boundary_idl__
#include <com/sun/star/i18n/Boundary.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/i18n/XBreakIterator.idl b/offapi/com/sun/star/i18n/XBreakIterator.idl
index 15996c5e6850..47a36c855557 100644
--- a/offapi/com/sun/star/i18n/XBreakIterator.idl
+++ b/offapi/com/sun/star/i18n/XBreakIterator.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_i18n_XBreakIterator_idl__
#define __com_sun_star_i18n_XBreakIterator_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakUserOptions_idl__
#include <com/sun/star/i18n/LineBreakUserOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
#include <com/sun/star/i18n/LineBreakHyphenationOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakResults_idl__
#include <com/sun/star/i18n/LineBreakResults.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_Boundary_idl__
#include <com/sun/star/i18n/Boundary.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl b/offapi/com/sun/star/i18n/XCharacterClassification.idl
index 502a1a4254c2..3423913e2ddd 100644
--- a/offapi/com/sun/star/i18n/XCharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl
@@ -29,13 +29,8 @@
#define __com_sun_star_i18n_XCharacterClassification_idl__
#include <com/sun/star/i18n/ParseResult.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
index 6b107c02bec5..ae8be008d169 100644
--- a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
+++ b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
@@ -28,13 +28,8 @@
#define __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/ForbiddenCharacters.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
index 14244be6264f..00c80b0ca513 100644
--- a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_i18n_XIndexEntrySupplier_idl__
#define __com_sun_star_i18n_XIndexEntrySupplier_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/i18n/XNumberFormatCode.idl b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
index 662657ff3ee4..3eceb5eef5e4 100644
--- a/offapi/com/sun/star/i18n/XNumberFormatCode.idl
+++ b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_i18n_XNumberFormatCode_idl__
#define __com_sun_star_i18n_XNumberFormatCode_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/i18n/NumberFormatCode.idl>
diff --git a/offapi/com/sun/star/i18n/XTextConversion.idl b/offapi/com/sun/star/i18n/XTextConversion.idl
index e18e4348d54f..87f72c6a632c 100644
--- a/offapi/com/sun/star/i18n/XTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XTextConversion.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_i18n_XTextConversion_idl__
#define __com_sun_star_i18n_XTextConversion_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_TextConversionResult_idl__
#include <com/sun/star/i18n/TextConversionResult.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/image/ImageMap.idl b/offapi/com/sun/star/image/ImageMap.idl
index 4dc3f4c0060a..d18ad608c14b 100644
--- a/offapi/com/sun/star/image/ImageMap.idl
+++ b/offapi/com/sun/star/image/ImageMap.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_image_ImageMap_idl__
#define __com_sun_star_image_ImageMap_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/image/ImageMapCircleObject.idl b/offapi/com/sun/star/image/ImageMapCircleObject.idl
index 4e9f8090dbd5..b10608b38ebe 100644
--- a/offapi/com/sun/star/image/ImageMapCircleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapCircleObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_image_ImageMapCircleObject_idl__
#define __com_sun_star_image_ImageMapCircleObject_idl__
-#ifndef __com_sun_star_image_ImageMapObject_idl__
#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/image/ImageMapObject.idl b/offapi/com/sun/star/image/ImageMapObject.idl
index de29a2f22d3c..8f732f2c3660 100644
--- a/offapi/com/sun/star/image/ImageMapObject.idl
+++ b/offapi/com/sun/star/image/ImageMapObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_image_ImageMapObject_idl__
#define __com_sun_star_image_ImageMapObject_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
#include <com/sun/star/document/XEventsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/image/ImageMapPolygonObject.idl b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
index 7c5af152b4df..d50e7a2dc98a 100644
--- a/offapi/com/sun/star/image/ImageMapPolygonObject.idl
+++ b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_image_ImageMapPolygonObject_idl__
#define __com_sun_star_image_ImageMapPolygonObject_idl__
-#ifndef __com_sun_star_image_ImageMapObject_idl__
#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-#ifndef __com_sun_star_drawing_PointSequence_idl__
#include <com/sun/star/drawing/PointSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/image/ImageMapRectangleObject.idl b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
index 1a6e10ea3f79..8a479850985c 100644
--- a/offapi/com/sun/star/image/ImageMapRectangleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_image_ImageMapRectangleObject_idl__
#define __com_sun_star_image_ImageMapRectangleObject_idl__
-#ifndef __com_sun_star_image_ImageMapObject_idl__
#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
index 900610538b35..309661826ec4 100644
--- a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
+++ b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_inspection_DefaultHelpProvider_idl__
#define __com_sun_star_inspection_DefaultHelpProvider_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
index c93f7a958ba5..9ae781eb17f0 100644
--- a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_GenericPropertyHandler_idl__
#define __com_sun_star_inspection_GenericPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl
index ac532045a070..3abf74dcb7e3 100644
--- a/offapi/com/sun/star/inspection/LineDescriptor.idl
+++ b/offapi/com/sun/star/inspection/LineDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_LineDescriptor_idl__
#define __com_sun_star_inspection_LineDescriptor_idl__
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/ObjectInspector.idl b/offapi/com/sun/star/inspection/ObjectInspector.idl
index 9a0386bee9f0..f09e23e8ac64 100644
--- a/offapi/com/sun/star/inspection/ObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspector.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_inspection_ObjectInspector_idl__
#define __com_sun_star_inspection_ObjectInspector_idl__
-#ifndef __com_sun_star_inspection_XObjectInspector_idl__
#include <com/sun/star/inspection/XObjectInspector.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
index 00a55a0b43c3..7804497c0607 100644
--- a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_inspection_ObjectInspectorModel_idl__
#define __com_sun_star_inspection_ObjectInspectorModel_idl__
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XHyperlinkControl.idl b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
index f6daa5f8c179..51ebf2ab93d7 100644
--- a/offapi/com/sun/star/inspection/XHyperlinkControl.idl
+++ b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_inspection_XHyperlinkControl_idl__
#define __com_sun_star_inspection_XHyperlinkControl_idl__
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
#include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
#include <com/sun/star/awt/XActionListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XNumericControl.idl b/offapi/com/sun/star/inspection/XNumericControl.idl
index 2309d1e830f1..0712a8b113d7 100644
--- a/offapi/com/sun/star/inspection/XNumericControl.idl
+++ b/offapi/com/sun/star/inspection/XNumericControl.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_inspection_XNumericControl_idl__
#define __com_sun_star_inspection_XNumericControl_idl__
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
#include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XObjectInspector.idl b/offapi/com/sun/star/inspection/XObjectInspector.idl
index 664221ff03fd..dc20d128cb9b 100644
--- a/offapi/com/sun/star/inspection/XObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspector.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_inspection_XObjectInspector_idl__
#define __com_sun_star_inspection_XObjectInspector_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
index 39352ab2a9e7..30fe3c180daf 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#define __com_sun_star_inspection_XObjectInspectorModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_inspection_PropertyCategoryDescriptor_idl__
#include <com/sun/star/inspection/PropertyCategoryDescriptor.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
index f6a90c824426..1bb95f315c3e 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_inspection_XObjectInspectorUI_idl__
#define __com_sun_star_inspection_XObjectInspectorUI_idl__
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
#include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index b48f730fa7d9..a22453bef597 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_inspection_XPropertyControl_idl__
#define __com_sun_star_inspection_XPropertyControl_idl__
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
#include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index 457ef549652d..82380b99f881 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_XPropertyControlContext_idl__
#define __com_sun_star_inspection_XPropertyControlContext_idl__
-#ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
#include <com/sun/star/inspection/XPropertyControlObserver.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
index 964a2c4fb3e8..b7c43d0f239b 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_XPropertyControlFactory_idl__
#define __com_sun_star_inspection_XPropertyControlFactory_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
index 51263e6824a5..c3c0e863382d 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
#define __com_sun_star_inspection_XPropertyControlObserver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index ed8b80195a73..2e1aa4081b24 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#define __com_sun_star_inspection_XPropertyHandler_idl__
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef __com_sun_star_inspection_LineDescriptor_idl__
#include <com/sun/star/inspection/LineDescriptor.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_inspection_InteractiveSelectionResult_idl__
#include <com/sun/star/inspection/InteractiveSelectionResult.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XStringListControl.idl b/offapi/com/sun/star/inspection/XStringListControl.idl
index 0e5fcb5e111e..53f1f5782d14 100644
--- a/offapi/com/sun/star/inspection/XStringListControl.idl
+++ b/offapi/com/sun/star/inspection/XStringListControl.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_XStringListControl_idl__
#define __com_sun_star_inspection_XStringListControl_idl__
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
#include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index b0a4f66d9773..dbbdbc1160f1 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_inspection_XStringRepresentation_idl__
#define __com_sun_star_inspection_XStringRepresentation_idl__
-#ifndef __com_sun_star_script_XTypeConverter_idl__
#include <com/sun/star/script/XTypeConverter.idl>
-#endif
//=============================================================================
module com { module sun { module star { module inspection {
diff --git a/offapi/com/sun/star/installation/InstallationCheck.idl b/offapi/com/sun/star/installation/InstallationCheck.idl
index fd459bdd6576..d9f473bc6158 100644
--- a/offapi/com/sun/star/installation/InstallationCheck.idl
+++ b/offapi/com/sun/star/installation/InstallationCheck.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_InstallationCheck_idl__
#define __com_sun_star_installation_InstallationCheck_idl__
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
#include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/InstallationCheckService.idl b/offapi/com/sun/star/installation/InstallationCheckService.idl
index b9c242c9f3fc..6d5155badb3d 100644
--- a/offapi/com/sun/star/installation/InstallationCheckService.idl
+++ b/offapi/com/sun/star/installation/InstallationCheckService.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_InstallationCheckService_idl__
#define __com_sun_star_installation_InstallationCheckService_idl__
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
#include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/InternetSettings.idl b/offapi/com/sun/star/installation/InternetSettings.idl
index 578bfa592f1e..4a6d88307439 100644
--- a/offapi/com/sun/star/installation/InternetSettings.idl
+++ b/offapi/com/sun/star/installation/InternetSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_InternetSettings_idl__
#define __com_sun_star_installation_InternetSettings_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
index e18062e667c5..b4fb23b834e7 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_ProtocolHandlerCheck_idl__
#define __com_sun_star_installation_ProtocolHandlerCheck_idl__
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
#include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
index e2a9bc1b1830..6bc5c32fc6f4 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_ProtocolHandlerCheckService_idl__
#define __com_sun_star_installation_ProtocolHandlerCheckService_idl__
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
#include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/XInstallationCheck.idl b/offapi/com/sun/star/installation/XInstallationCheck.idl
index 41fc7b1b90ad..7baee94aa4ab 100644
--- a/offapi/com/sun/star/installation/XInstallationCheck.idl
+++ b/offapi/com/sun/star/installation/XInstallationCheck.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_installation_XInstallationCheck_idl__
#define __com_sun_star_installation_XInstallationCheck_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
index 7e4c7c9429df..1a8ee29e0cf9 100644
--- a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
#define __com_sun_star_installation_XProtocolHandlerCheck_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_installation_ProtDlgRes_idl__
#include <com/sun/star/installation/ProtDlgRes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ldap/LdapConnectionException.idl b/offapi/com/sun/star/ldap/LdapConnectionException.idl
index df0d963807e9..94af54ed80cb 100644
--- a/offapi/com/sun/star/ldap/LdapConnectionException.idl
+++ b/offapi/com/sun/star/ldap/LdapConnectionException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ldap_LdapConnectionException_idl__
#define __com_sun_star_ldap_LdapConnectionException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module ldap {
diff --git a/offapi/com/sun/star/ldap/LdapGenericException.idl b/offapi/com/sun/star/ldap/LdapGenericException.idl
index bcdaab0cf00f..624d8c692e48 100644
--- a/offapi/com/sun/star/ldap/LdapGenericException.idl
+++ b/offapi/com/sun/star/ldap/LdapGenericException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ldap_LdapGenericException_idl__
#define __com_sun_star_ldap_LdapGenericException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module ldap {
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
index b501478f8ebd..7391fc038495 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_linguistic2_ConversionDictionary_idl__
#define __com_sun_star_linguistic2_ConversionDictionary_idl__
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
#include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionPropertyType_idl__
#include <com/sun/star/linguistic2/XConversionPropertyType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
index 825634af1849..9338ae8a646c 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_ConversionDictionaryList_idl__
#define __com_sun_star_linguistic2_ConversionDictionaryList_idl__
-#ifndef __com_sun_star_linguistic2_XConversionDictionaryList_idl__
#include <com/sun/star/linguistic2/XConversionDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl
index 397b882bc78d..4f4ca6b58b97 100644
--- a/offapi/com/sun/star/linguistic2/Dictionary.idl
+++ b/offapi/com/sun/star/linguistic2/Dictionary.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_linguistic2_Dictionary_idl__
#define __com_sun_star_linguistic2_Dictionary_idl__
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
#include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
#include <com/sun/star/linguistic2/XSearchableDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStorable_idl__
#include <com/sun/star/frame/XStorable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
index e76395292204..25bc084c7d79 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
#define __com_sun_star_linguistic2_DictionaryEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index 10c412dd4eb6..4fdb478a59ed 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_linguistic2_DictionaryList_idl__
#define __com_sun_star_linguistic2_DictionaryList_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
index 8718219247dd..2c9df5cc81ff 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
#define __com_sun_star_linguistic2_DictionaryListEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
#include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index 630a0c64baa1..5d50ec171d45 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_linguistic2_Hyphenator_idl__
#define __com_sun_star_linguistic2_Hyphenator_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
#include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index c1a932eaf8f5..5237bf92dc49 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_linguistic2_LinguProperties_idl__
#define __com_sun_star_linguistic2_LinguProperties_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
index c420b7516c85..3a421b376389 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
#define __com_sun_star_linguistic2_LinguServiceEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index eac83abc40d6..9d55117c93af 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_linguistic2_LinguServiceManager_idl__
#define __com_sun_star_linguistic2_LinguServiceManager_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
index 2a0fde6a0d12..867d120b425a 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
@@ -27,23 +27,10 @@
#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
#define __com_sun_star_linguistic2_ProofreadingResult_idl__
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
#include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
#include <com/sun/star/linguistic2/SingleProofreadingError.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
index e7fc894e0cea..385b13dd7cbc 100644
--- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
+++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
#define __com_sun_star_linguistic2_SingleProofreadingError_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index ba2c9a90c29a..d6c7ffdf42a4 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_linguistic2_SpellChecker_idl__
#define __com_sun_star_linguistic2_SpellChecker_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
#include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index e181ea0f70a9..19b0f664602c 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_linguistic2_Thesaurus_idl__
#define __com_sun_star_linguistic2_Thesaurus_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
#include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
index 97d75f7c0937..c1368243c23a 100644
--- a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
@@ -28,9 +28,7 @@
#define __com_sun_star_linguistic2_XAvailableLocales_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
index ddcf471bcd39..cdd15c5ffb57 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
@@ -28,33 +28,13 @@
#define __com_sun_star_linguistic2_XConversionDictionary_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDictionaryType_idl__
#include <com/sun/star/linguistic2/ConversionDictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDirection_idl__
#include <com/sun/star/linguistic2/ConversionDirection.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
index 471968b9045f..d464053e9d37 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
@@ -28,29 +28,12 @@
#define __com_sun_star_linguistic2_XConversionDictionaryList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
#include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
index 7dcccf3d05f8..e813ddf42ca4 100644
--- a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
@@ -28,18 +28,11 @@
#define __com_sun_star_linguistic2_XConversionPropertyType_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionary.idl b/offapi/com/sun/star/linguistic2/XDictionary.idl
index 57ddc8a5e9c2..d0c504ee62da 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_linguistic2_XDictionary_idl__
#define __com_sun_star_linguistic2_XDictionary_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
#include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
#include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionary1.idl b/offapi/com/sun/star/linguistic2/XDictionary1.idl
index acf2b38fbc93..73fc5f89695c 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary1.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary1.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_linguistic2_XDictionary1_idl__
#define __com_sun_star_linguistic2_XDictionary1_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
#include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
#include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
index fd24e981c4c6..ae7ef99b1fb0 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#define __com_sun_star_linguistic2_XDictionaryEntry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
index 7436ab9283cc..3ec4c8fbf6ed 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
#define __com_sun_star_linguistic2_XDictionaryEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
#include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryList.idl b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
index e747bbd82c29..49520f367160 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
#define __com_sun_star_linguistic2_XDictionaryList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
#include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
#include <com/sun/star/linguistic2/XDictionaryListEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
index c1c251de04ae..047265536803 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
#define __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
#include <com/sun/star/linguistic2/DictionaryListEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
index 94aa9166c2e9..510672a23d60 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
#define __com_sun_star_linguistic2_XHyphenatedWord_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenator.idl b/offapi/com/sun/star/linguistic2/XHyphenator.idl
index fd69fd1682ea..5b4ccc81a0a4 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenator.idl
@@ -28,34 +28,13 @@
#define __com_sun_star_linguistic2_XHyphenator_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
#include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
#include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
#include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
#include <com/sun/star/linguistic2/XPossibleHyphens.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index 4b859bd58dbd..f20a211d5bdb 100644
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_linguistic2_XLanguageGuessing_idl__
#define __com_sun_star_linguistic2_XLanguageGuessing_idl__
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_idl_
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_idl_
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_IDL_
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com { module sun { module star { module linguistic2 {
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
index f98c84a395a3..1947f1706c56 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
@@ -28,13 +28,8 @@
#define __com_sun_star_linguistic2_XLinguServiceEventBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
#include <com/sun/star/linguistic2/XLinguServiceEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
index f838529078e4..84382cb5feb4 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
@@ -28,13 +28,8 @@
#define __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
#include <com/sun/star/linguistic2/LinguServiceEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
index 77fa2f0a2aaa..f68ee6080c77 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
@@ -28,21 +28,10 @@
#define __com_sun_star_linguistic2_XLinguServiceManager_idl__
-#ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
#include <com/sun/star/linguistic2/XSpellChecker.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
#include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XThesaurus_idl__
#include <com/sun/star/linguistic2/XThesaurus.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XMeaning.idl b/offapi/com/sun/star/linguistic2/XMeaning.idl
index f7a0eb007817..668c936046a3 100644
--- a/offapi/com/sun/star/linguistic2/XMeaning.idl
+++ b/offapi/com/sun/star/linguistic2/XMeaning.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_linguistic2_XMeaning_idl__
#define __com_sun_star_linguistic2_XMeaning_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
index c33a2ff5fbfb..ee8be10d2055 100644
--- a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
+++ b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
#define __com_sun_star_linguistic2_XPossibleHyphens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl
index 2ecd5be9ae65..952debd53f6c 100644
--- a/offapi/com/sun/star/linguistic2/XProofreader.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreader.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_linguistic2_XProofreader_idl__
#define __com_sun_star_linguistic2_XProofreader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
#include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
#include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
#include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
index 37b6ef5ecd43..910c5ca7290f 100644
--- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_linguistic2_XProofreadingIterator_idl__
#define __com_sun_star_linguistic2_XProofreadingIterator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
#include <com/sun/star/text/XFlatParagraphIteratorProvider.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
#include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
#include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
index 69c8f00b3089..f048d23af074 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
#define __com_sun_star_linguistic2_XSearchableDictionary_idl__
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
#include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
index 94dd48a15573..d9a72e0bec30 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
@@ -28,17 +28,9 @@
#define __com_sun_star_linguistic2_XSearchableDictionaryList_idl__
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
#include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
#include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
index b4aa581789c3..9f72356a1f73 100644
--- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
#define __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
index c4a2afe16909..1ed28661e6d4 100644
--- a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
#define __com_sun_star_linguistic2_XSpellAlternatives_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker.idl b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
index 2eedbce715e6..3c70f02795d7 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
@@ -27,26 +27,11 @@
#ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
#define __com_sun_star_linguistic2_XSpellChecker_idl__
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
#include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
#include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
#include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
index 39f649b383c4..189dd6b0ab47 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
@@ -27,26 +27,11 @@
#ifndef __com_sun_star_linguistic2_XSpellChecker1_idl__
#define __com_sun_star_linguistic2_XSpellChecker1_idl__
-#ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
#include <com/sun/star/linguistic2/XSupportedLanguages.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
#include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
#include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
index 38410fb5e788..f23748654d3d 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
#define __com_sun_star_linguistic2_XSupportedLanguages_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
index 6e145eaee2c3..8dd4f83cfa8d 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
#define __com_sun_star_linguistic2_XSupportedLocales_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XThesaurus.idl b/offapi/com/sun/star/linguistic2/XThesaurus.idl
index 602f78184bd7..cd34d1bfb609 100644
--- a/offapi/com/sun/star/linguistic2/XThesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/XThesaurus.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_linguistic2_XThesaurus_idl__
#define __com_sun_star_linguistic2_XThesaurus_idl__
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
#include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XMeaning_idl__
#include <com/sun/star/linguistic2/XMeaning.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/ConsoleHandler.idl b/offapi/com/sun/star/logging/ConsoleHandler.idl
index 92bd6fdc7e28..eb8ad4ce3e17 100644
--- a/offapi/com/sun/star/logging/ConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/ConsoleHandler.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_logging_ConsoleHandler_idl__
#define __com_sun_star_logging_ConsoleHandler_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/DocumentIOLogRing.idl b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
index 59593e2b3285..fd35a54fccb4 100644
--- a/offapi/com/sun/star/logging/DocumentIOLogRing.idl
+++ b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_logging_DocumentIOLogRing_idl__
#define __com_sun_star_logging_DocumentIOLogRing_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/FileHandler.idl b/offapi/com/sun/star/logging/FileHandler.idl
index b20a50618a56..68501f8dd28c 100644
--- a/offapi/com/sun/star/logging/FileHandler.idl
+++ b/offapi/com/sun/star/logging/FileHandler.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_logging_FileHandler_idl__
#define __com_sun_star_logging_FileHandler_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/LogRecord.idl b/offapi/com/sun/star/logging/LogRecord.idl
index 9d35f351de04..c4c8b4636a02 100644
--- a/offapi/com/sun/star/logging/LogRecord.idl
+++ b/offapi/com/sun/star/logging/LogRecord.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_logging_LogRecord_idl__
#define __com_sun_star_logging_LogRecord_idl__
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/LoggerPool.idl b/offapi/com/sun/star/logging/LoggerPool.idl
index 5372e09c088d..e71a3e9c8f64 100644
--- a/offapi/com/sun/star/logging/LoggerPool.idl
+++ b/offapi/com/sun/star/logging/LoggerPool.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_logging_LoggerPool_idl__
#define __com_sun_star_logging_LoggerPool_idl__
-#ifndef __com_sun_star_logging_XLoggerPool_idl__
#include <com/sun/star/logging/XLoggerPool.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/SimpleLogRing.idl b/offapi/com/sun/star/logging/SimpleLogRing.idl
index fe3083724c26..c23c3788c2e4 100644
--- a/offapi/com/sun/star/logging/SimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/SimpleLogRing.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_logging_SimpleLogRing_idl__
#define __com_sun_star_logging_SimpleLogRing_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XConsoleHandler.idl b/offapi/com/sun/star/logging/XConsoleHandler.idl
index c78fde557052..de854df65cee 100644
--- a/offapi/com/sun/star/logging/XConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/XConsoleHandler.idl
@@ -28,9 +28,7 @@
#ifndef __offapi_com_sun_star_logging_XConsoleHandler_idl__
#define __offapi_com_sun_star_logging_XConsoleHandler_idl__
-#ifndef __com_sun_star_logging_XLogHandler_idl__
#include <com/sun/star/logging/XLogHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XCsvLogFormatter.idl b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
index 6e052fa751f2..6e77b299e95a 100644
--- a/offapi/com/sun/star/logging/XCsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_logging_XCsvLogFormatter_idl__
#define __com_sun_star_logging_XCsvLogFormatter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
#include <com/sun/star/logging/XLogFormatter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XLogFormatter.idl b/offapi/com/sun/star/logging/XLogFormatter.idl
index 4a0e5c68b6ef..57c5a779d561 100644
--- a/offapi/com/sun/star/logging/XLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XLogFormatter.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_logging_XLogFormatter_idl__
#define __com_sun_star_logging_XLogFormatter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
#include <com/sun/star/logging/LogRecord.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XLogHandler.idl b/offapi/com/sun/star/logging/XLogHandler.idl
index b74ed1c24291..d1370e9a5010 100644
--- a/offapi/com/sun/star/logging/XLogHandler.idl
+++ b/offapi/com/sun/star/logging/XLogHandler.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_logging_XLogHandler_idl__
#define __com_sun_star_logging_XLogHandler_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
#include <com/sun/star/logging/LogRecord.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
#include <com/sun/star/logging/XLogFormatter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl
index e0f34108643a..3da945cfae90 100644
--- a/offapi/com/sun/star/logging/XLogger.idl
+++ b/offapi/com/sun/star/logging/XLogger.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_logging_XLogger_idl__
#define __com_sun_star_logging_XLogger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XLoggerPool.idl b/offapi/com/sun/star/logging/XLoggerPool.idl
index e7c1017dc8a4..ec5cf81d271a 100644
--- a/offapi/com/sun/star/logging/XLoggerPool.idl
+++ b/offapi/com/sun/star/logging/XLoggerPool.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_logging_XLoggerPool_idl__
#define __com_sun_star_logging_XLoggerPool_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/logging/XSimpleLogRing.idl b/offapi/com/sun/star/logging/XSimpleLogRing.idl
index a0a8d1f0483c..7432648ec21c 100644
--- a/offapi/com/sun/star/logging/XSimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/XSimpleLogRing.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_logging_XSimpleLogRing_idl__
#define __com_sun_star_logging_XSimpleLogRing_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mail/MailAttachment.idl b/offapi/com/sun/star/mail/MailAttachment.idl
index 67bd662629af..f5529284d654 100644
--- a/offapi/com/sun/star/mail/MailAttachment.idl
+++ b/offapi/com/sun/star/mail/MailAttachment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_MailAttachment_idl__
#define __com_sun_star_mail_MailAttachment_idl__
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/MailException.idl b/offapi/com/sun/star/mail/MailException.idl
index 2022c2aee483..d952578ca8cc 100644
--- a/offapi/com/sun/star/mail/MailException.idl
+++ b/offapi/com/sun/star/mail/MailException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_MailException_idl__
#define __com_sun_star_mail_MailException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/MailMessage.idl b/offapi/com/sun/star/mail/MailMessage.idl
index 71dea28cb36c..28d63c5a04e7 100644
--- a/offapi/com/sun/star/mail/MailMessage.idl
+++ b/offapi/com/sun/star/mail/MailMessage.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_mail_MailMessage_idl__
#define __com_sun_star_mail_MailMessage_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
#include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/MailServer.idl b/offapi/com/sun/star/mail/MailServer.idl
index 2ae7afc016bf..8076a5df2c47 100644
--- a/offapi/com/sun/star/mail/MailServer.idl
+++ b/offapi/com/sun/star/mail/MailServer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_MailServer_idl__
#define __com_sun_star_mail_MailServer_idl__
-#ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
#include <com/sun/star/mail/NoMailTransportProviderException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/MailServiceProvider.idl b/offapi/com/sun/star/mail/MailServiceProvider.idl
index 0645d9556e66..9f2acbad513e 100644
--- a/offapi/com/sun/star/mail/MailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/MailServiceProvider.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_mail_MailServiceProvider_idl__
#define __com_sun_star_mail_MailServiceProvider_idl__
-#ifndef __com_sun_star_mail_XMailServiceProvider_idl__
#include <com/sun/star/mail/XMailServiceProvider.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
#include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
#include <com/sun/star/mail/MailServiceType.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
index f1a2074d66ea..b1af77081171 100644
--- a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
#define __com_sun_star_mail_NoMailServiceProviderException_idl__
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
index fa275ed7f7f2..a389c2fd4d9a 100644
--- a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
#define __com_sun_star_mail_NoMailTransportProviderException_idl__
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
index 91a6cb29b5d8..edfe8bba17eb 100644
--- a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
+++ b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
#define __com_sun_star_mail_SendMailMessageFailedException_idl__
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XAuthenticator.idl b/offapi/com/sun/star/mail/XAuthenticator.idl
index 6ae813a161ef..142f046c43c2 100644
--- a/offapi/com/sun/star/mail/XAuthenticator.idl
+++ b/offapi/com/sun/star/mail/XAuthenticator.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mail_XAuthenticator_idl__
#define __com_sun_star_mail_XAuthenticator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XConnectionListener.idl b/offapi/com/sun/star/mail/XConnectionListener.idl
index cd5153f5e96e..469bc6bfcdea 100644
--- a/offapi/com/sun/star/mail/XConnectionListener.idl
+++ b/offapi/com/sun/star/mail/XConnectionListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_mail_XConnectionListener_idl__
#define __com_sun_star_mail_XConnectionListener_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
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XMailMessage.idl b/offapi/com/sun/star/mail/XMailMessage.idl
index 596596e6bec3..e25eed8830c3 100644
--- a/offapi/com/sun/star/mail/XMailMessage.idl
+++ b/offapi/com/sun/star/mail/XMailMessage.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_mail_XMailMessage_idl__
#define __com_sun_star_mail_XMailMessage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
#include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
#include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XMailServer.idl b/offapi/com/sun/star/mail/XMailServer.idl
index ade044ebcbea..02217a1a2396 100644
--- a/offapi/com/sun/star/mail/XMailServer.idl
+++ b/offapi/com/sun/star/mail/XMailServer.idl
@@ -28,65 +28,21 @@
#ifndef __com_sun_star_mail_XMailServer_idl__
#define __com_sun_star_mail_XMailServer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
#include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
#include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
#include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
#include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
#include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
#include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
#include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
#include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
#include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
#include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XMailService.idl b/offapi/com/sun/star/mail/XMailService.idl
index 2444e4b39d0a..331725e373b1 100644
--- a/offapi/com/sun/star/mail/XMailService.idl
+++ b/offapi/com/sun/star/mail/XMailService.idl
@@ -28,53 +28,18 @@
#ifndef __com_sun_star_mail_XMailService_idl__
#define __com_sun_star_mail_XMailService_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
#include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
#include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
#include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
#include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
#include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
#include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
#include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XCurrentContext_idl__
#include <com/sun/star/uno/XCurrentContext.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XMailServiceProvider.idl b/offapi/com/sun/star/mail/XMailServiceProvider.idl
index 5430a45fced0..aab6cf4a5b49 100644
--- a/offapi/com/sun/star/mail/XMailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/XMailServiceProvider.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_mail_XMailServiceProvider_idl__
#define __com_sun_star_mail_XMailServiceProvider_idl__
-#ifndef __com_sun_star_mail_XMailService_idl__
#include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
#include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
#include <com/sun/star/mail/MailServiceType.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XSmtpService.idl b/offapi/com/sun/star/mail/XSmtpService.idl
index a93b82f1bceb..9b72d57dce61 100644
--- a/offapi/com/sun/star/mail/XSmtpService.idl
+++ b/offapi/com/sun/star/mail/XSmtpService.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_mail_XSmtpService_idl__
#define __com_sun_star_mail_XSmtpService_idl__
-#ifndef __com_sun_star_mail_XMailService_idl__
#include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
#include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
#include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
#include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
#include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/media/Manager.idl b/offapi/com/sun/star/media/Manager.idl
index 2eed3fb47625..8b225769a12b 100644
--- a/offapi/com/sun/star/media/Manager.idl
+++ b/offapi/com/sun/star/media/Manager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_media_Manager_idl__
#define __com_sun_star_media_Manager_idl__
-#ifndef __com_sun_star_media_XManager_idl__
#include <com/sun/star/media/XManager.idl>
-#endif
module com { module sun { module star { module media {
diff --git a/offapi/com/sun/star/media/XFrameGrabber.idl b/offapi/com/sun/star/media/XFrameGrabber.idl
index 36852c9802d3..5b203f594bdd 100644
--- a/offapi/com/sun/star/media/XFrameGrabber.idl
+++ b/offapi/com/sun/star/media/XFrameGrabber.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_media_XFrameGrabber_idl__
#define __com_sun_star_media_XFrameGrabber_idl__
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
module com { module sun { module star { module media {
diff --git a/offapi/com/sun/star/media/XManager.idl b/offapi/com/sun/star/media/XManager.idl
index 1e63ee20bfc9..8166351ef244 100644
--- a/offapi/com/sun/star/media/XManager.idl
+++ b/offapi/com/sun/star/media/XManager.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_media_XManager_idl__
#define __com_sun_star_media_XManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayer_idl__
#include <com/sun/star/media/XPlayer.idl>
-#endif
module com { module sun { module star { module media {
diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl
index 7546e9d27d8c..a4d82d28fbe9 100644
--- a/offapi/com/sun/star/media/XPlayer.idl
+++ b/offapi/com/sun/star/media/XPlayer.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_media_XPlayer_idl__
#define __com_sun_star_media_XPlayer_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayerWindow_idl__
#include <com/sun/star/media/XPlayerWindow.idl>
-#endif
-#ifndef __com_sun_star_media_XFrameGrabber_idl__
#include <com/sun/star/media/XFrameGrabber.idl>
-#endif
module com { module sun { module star { module media {
diff --git a/offapi/com/sun/star/media/XPlayerWindow.idl b/offapi/com/sun/star/media/XPlayerWindow.idl
index efd8f6750243..f4833cee2ab0 100644
--- a/offapi/com/sun/star/media/XPlayerWindow.idl
+++ b/offapi/com/sun/star/media/XPlayerWindow.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_media_XPlayerWindow_idl__
#define __com_sun_star_media_XPlayerWindow_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_media_ZoomLevel_idl__
#include <com/sun/star/media/ZoomLevel.idl>
-#endif
module com { module sun { module star { module media {
diff --git a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
index 1fac0524bba7..d260d633d8fe 100644
--- a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
#define __com_sun_star_mozilla_MenuMultipleChange_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/MenuProxy.idl b/offapi/com/sun/star/mozilla/MenuProxy.idl
index 9e2bbf75eae1..875c113f992d 100644
--- a/offapi/com/sun/star/mozilla/MenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxy.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_mozilla_MenuProxy_idl__
#define __com_sun_star_mozilla_MenuProxy_idl__
-#ifndef __com_sun_star_mozilla_XMenuProxy_idl__
#include <com/sun/star/mozilla/XMenuProxy.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/MenuProxyListener.idl b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
index b239ae302b58..c3deceb3f66d 100644
--- a/offapi/com/sun/star/mozilla/MenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_mozilla_MenuProxyListener_idl__
#define __com_sun_star_mozilla_MenuProxyListener_idl__
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
#include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/MenuSingleChange.idl b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
index d46210ed9306..4c60204e9143 100644
--- a/offapi/com/sun/star/mozilla/MenuSingleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
#define __com_sun_star_mozilla_MenuSingleChange_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
index 5b15847fa352..72f95517c693 100644
--- a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_mozilla_MozillaBootstrap_idl__
#define __com_sun_star_mozilla_MozillaBootstrap_idl__
-#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
#include <com/sun/star/mozilla/XMozillaBootstrap.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
index 2a62769e8094..d51fe3263a8c 100644
--- a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
+++ b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_mozilla_XCloseSessionListener_idl__
#define __com_sun_star_mozilla_XCloseSessionListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XCodeProxy.idl b/offapi/com/sun/star/mozilla/XCodeProxy.idl
index c91eacd092ac..2ce48d0e22e9 100644
--- a/offapi/com/sun/star/mozilla/XCodeProxy.idl
+++ b/offapi/com/sun/star/mozilla/XCodeProxy.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdbc_XCodeProxy_idl__
#define __com_sun_star_sdbc_XCodeProxy_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
#include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
module com { module sun { module star { module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XMenuProxy.idl b/offapi/com/sun/star/mozilla/XMenuProxy.idl
index 15aefc596ef0..d6d2dbf5cf0c 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxy.idl
@@ -29,13 +29,9 @@
#ifndef __com_sun_star_mozilla_XMenuProxy_idl__
#define __com_sun_star_mozilla_XMenuProxy_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
#include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
index 78b3d7d5df21..c156712db074 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
@@ -29,17 +29,11 @@
#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
#define __com_sun_star_mozilla_XMenuProxyListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
#include <com/sun/star/mozilla/MenuMultipleChange.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
#include <com/sun/star/mozilla/MenuSingleChange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
index e955ad2b93cb..6796a0ea2f9f 100644
--- a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
@@ -27,19 +27,10 @@
#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
#define __com_sun_star_mozilla_XMozillaBootstrap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
#include <com/sun/star/mozilla/XProfileDiscover.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProfileManager_idl__
#include <com/sun/star/mozilla/XProfileManager.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProxyRunner_idl__
#include <com/sun/star/mozilla/XProxyRunner.idl>
-#endif
module com { module sun { module star { module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XPluginInstance.idl b/offapi/com/sun/star/mozilla/XPluginInstance.idl
index 4738e0462408..ed47702e5929 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstance.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstance.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_mozilla_XPluginInstance_idl__
#define __com_sun_star_mozilla_XPluginInstance_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
index 20ad31aed362..c7038d969ea5 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
#define __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
index 328969781bcc..dbdbe71d97e2 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_mozilla_XPluginInstancePeer_idl__
#define __com_sun_star_mozilla_XPluginInstancePeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
index 608681aa312f..1f9a898d3195 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
#define __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XPluginInstance_idl__
#include <com/sun/star/mozilla/XPluginInstance.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
index 3e8d86fba3c2..d12330746bfe 100644
--- a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_mozilla_XPluginWindowPeer_idl__
#define __com_sun_star_mozilla_XPluginWindowPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/mozilla/XProfileDiscover.idl b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
index bd36a6eb0b89..4df02e590d69 100644
--- a/offapi/com/sun/star/mozilla/XProfileDiscover.idl
+++ b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
#define __com_sun_star_mozilla_XProfileDiscover_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
#include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
module com { module sun { module star { module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XProfileManager.idl b/offapi/com/sun/star/mozilla/XProfileManager.idl
index 789afe850174..f09bdc5b7a02 100644
--- a/offapi/com/sun/star/mozilla/XProfileManager.idl
+++ b/offapi/com/sun/star/mozilla/XProfileManager.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_mozilla_XProfileManager_idl__
#define __com_sun_star_mozilla_XProfileManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
#include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
diff --git a/offapi/com/sun/star/mozilla/XProxyRunner.idl b/offapi/com/sun/star/mozilla/XProxyRunner.idl
index 9a07858618fa..b4d7c17a5847 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_mozilla_XProxyRunner_idl__
#define __com_sun_star_mozilla_XProxyRunner_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XCodeProxy_idl__
#include <com/sun/star/mozilla/XCodeProxy.idl>
-#endif
module com { module sun { module star { module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
index a08da8b54155..40e837cb5798 100644
--- a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
+++ b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
#define __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
index 7c601c5fe21a..d38c90624d90 100644
--- a/offapi/com/sun/star/office/XAnnotation.idl
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_office_XAnnotation_idl__
#define __com_sun_star_office_XAnnotation_idl__
-#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_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
#include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
index 201151b7c0fc..2eb65fd78c23 100644
--- a/offapi/com/sun/star/office/XAnnotationAccess.idl
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_office_XAnnotationAccess_idl__
#define __com_sun_star_office_XAnnotationAccess_idl__
-#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
#include <com/sun/star/office/XAnnotationEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/office/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
#include <com/sun/star/office/XAnnotation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
index aa252c9c5ded..c27f29f583b3 100644
--- a/offapi/com/sun/star/office/XAnnotationEnumeration.idl
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
#define __com_sun_star_office_XAnnotationEnumeration_idl__
-#ifndef __com_sun_star_office_XAnnotation_idl__
#include <com/sun/star/office/XAnnotation.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
index 61f5dbbfe140..db93be316eb2 100644
--- a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
+++ b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
#define __com_sun_star_packages_EncryptionNotAllowedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index cffecf7bd637..94fa8f4175d5 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_packages_NoEncryptionException_idl__
#define __com_sun_star_packages_NoEncryptionException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index a2730b41da62..51eb0698b0b7 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_packages_NoRawFormatException_idl__
#define __com_sun_star_packages_NoRawFormatException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/Package.idl b/offapi/com/sun/star/packages/Package.idl
index 0f576d5a41c9..4ee4b78b1188 100644
--- a/offapi/com/sun/star/packages/Package.idl
+++ b/offapi/com/sun/star/packages/Package.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_packages_Package_idl__
#define __com_sun_star_packages_Package_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__
#include <com/sun/star/util/XChangesBatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/PackageFolder.idl b/offapi/com/sun/star/packages/PackageFolder.idl
index 2825e0d4d447..7c7aa4eb8fe2 100644
--- a/offapi/com/sun/star/packages/PackageFolder.idl
+++ b/offapi/com/sun/star/packages/PackageFolder.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_packages_PackageFolder_idl__
#define __com_sun_star_packages_PackageFolder_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
module com { module sun { module star { module packages {
diff --git a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
index 11e1d6f22b5a..6b50050a0a8a 100644
--- a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
+++ b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
@@ -28,9 +28,7 @@
#define __com_sun_star_packages_PackageFolderEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/PackageStream.idl b/offapi/com/sun/star/packages/PackageStream.idl
index c12860f1cf57..8dff65df1488 100644
--- a/offapi/com/sun/star/packages/PackageStream.idl
+++ b/offapi/com/sun/star/packages/PackageStream.idl
@@ -28,21 +28,10 @@
#define __com_sun_star_packages_PackageStream_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index 954e0bd68afc..411ab5c45956 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_packages_WrongPasswordException_idl__
#define __com_sun_star_packages_WrongPasswordException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
index 40d448330a0e..dbe6ce3fd557 100644
--- a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
+++ b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_packages_XDataSinkEncrSupport_idl__
#define __com_sun_star_packages_XDataSinkEncrSupport_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
#include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
#include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
#include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
#include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/manifest/XManifestReader.idl b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
index 6867516d1f86..7a0a7b3047f5 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestReader.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_packages_manifest_XManifestReader_idl__
#define __com_sun_star_packages_manifest_XManifestReader_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
index c38b9cacaf76..6eb1ed7b9ab6 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_packages_manifest_XManifestWriter_idl__
#define __com_sun_star_packages_manifest_XManifestWriter_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index 215366e1905d..6cc11b3875a3 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
#define __com_sun_star_packages_zip_XZipFileAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_packages_zip_ZipEntry_idl__
#include <com/sun/star/packages/zip/ZipEntry.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl_
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/zip/ZipEntry.idl b/offapi/com/sun/star/packages/zip/ZipEntry.idl
index d70c8a68f559..0640781b5ecb 100644
--- a/offapi/com/sun/star/packages/zip/ZipEntry.idl
+++ b/offapi/com/sun/star/packages/zip/ZipEntry.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_packages_zip_ZipEntry_idl__
#define __com_sun_star_packages_zip_ZipEntry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/zip/ZipException.idl b/offapi/com/sun/star/packages/zip/ZipException.idl
index 4e816287ee92..fd2396061754 100644
--- a/offapi/com/sun/star/packages/zip/ZipException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipException.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_packages_zip_ZipException_idl__
#define __com_sun_star_packages_zip_ZipException_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
index 89d536edcd4e..1940b7fa264a 100644
--- a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_packages_zip_ZipFileAccess_idl__
#define __com_sun_star_packages_zip_ZipFileAccess_idl__
-#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
#include <com/sun/star/packages/zip/XZipFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/packages/zip/ZipIOException.idl b/offapi/com/sun/star/packages/zip/ZipIOException.idl
index 61cafda0af25..511dddfed805 100644
--- a/offapi/com/sun/star/packages/zip/ZipIOException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_packages_zip_ZipIOException_idl__
#define __com_sun_star_packages_zip_ZipIOException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/plugin/PluginException.idl b/offapi/com/sun/star/plugin/PluginException.idl
index 88f7dcdd7e60..cc42054ac531 100644
--- a/offapi/com/sun/star/plugin/PluginException.idl
+++ b/offapi/com/sun/star/plugin/PluginException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_plugin_PluginException_idl__
#define __com_sun_star_plugin_PluginException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/plugin/PluginManager.idl b/offapi/com/sun/star/plugin/PluginManager.idl
index 36421513e5a3..15f166a1f54e 100644
--- a/offapi/com/sun/star/plugin/PluginManager.idl
+++ b/offapi/com/sun/star/plugin/PluginManager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_plugin_PluginManager_idl__
#define __com_sun_star_plugin_PluginManager_idl__
-#ifndef __com_sun_star_plugin_XPluginManager_idl__
#include <com/sun/star/plugin/XPluginManager.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPlugin.idl b/offapi/com/sun/star/plugin/XPlugin.idl
index 0cc1d3214a80..fc39548abfaa 100644
--- a/offapi/com/sun/star/plugin/XPlugin.idl
+++ b/offapi/com/sun/star/plugin/XPlugin.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_plugin_XPlugin_idl__
#define __com_sun_star_plugin_XPlugin_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-#ifndef __com_sun_star_plugin_PluginException_idl__
#include <com/sun/star/plugin/PluginException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPluginContext.idl b/offapi/com/sun/star/plugin/XPluginContext.idl
index e70479587a76..c24b142d0e8d 100644
--- a/offapi/com/sun/star/plugin/XPluginContext.idl
+++ b/offapi/com/sun/star/plugin/XPluginContext.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_plugin_XPluginContext_idl__
#define __com_sun_star_plugin_XPluginContext_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_plugin_XPlugin_idl__
#include <com/sun/star/plugin/XPlugin.idl>
-#endif
-#ifndef __com_sun_star_plugin_PluginVariable_idl__
#include <com/sun/star/plugin/PluginVariable.idl>
-#endif
-#ifndef __com_sun_star_plugin_PluginException_idl__
#include <com/sun/star/plugin/PluginException.idl>
-#endif
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPluginManager.idl b/offapi/com/sun/star/plugin/XPluginManager.idl
index 56a118bfc97a..d7c333c0f917 100644
--- a/offapi/com/sun/star/plugin/XPluginManager.idl
+++ b/offapi/com/sun/star/plugin/XPluginManager.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_plugin_XPluginManager_idl__
#define __com_sun_star_plugin_XPluginManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_plugin_XPluginContext_idl__
#include <com/sun/star/plugin/XPluginContext.idl>
-#endif
-#ifndef __com_sun_star_plugin_PluginDescription_idl__
#include <com/sun/star/plugin/PluginDescription.idl>
-#endif
-#ifndef __com_sun_star_plugin_XPlugin_idl__
#include <com/sun/star/plugin/XPlugin.idl>
-#endif
-#ifndef __com_sun_star_plugin_PluginException_idl__
#include <com/sun/star/plugin/PluginException.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
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/ChartShape.idl b/offapi/com/sun/star/presentation/ChartShape.idl
index cf5802d78929..4b46a3313ea2 100644
--- a/offapi/com/sun/star/presentation/ChartShape.idl
+++ b/offapi/com/sun/star/presentation/ChartShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_ChartShape_idl__
#define __com_sun_star_presentation_ChartShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
#include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/CustomPresentation.idl b/offapi/com/sun/star/presentation/CustomPresentation.idl
index 68bd79aede66..6b44ded62099 100644
--- a/offapi/com/sun/star/presentation/CustomPresentation.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentation.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_CustomPresentation_idl__
#define __com_sun_star_presentation_CustomPresentation_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
index fe23098bfd36..23e41f529b7f 100644
--- a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_CustomPresentationAccess_idl__
#define __com_sun_star_presentation_CustomPresentationAccess_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/DateTimeShape.idl b/offapi/com/sun/star/presentation/DateTimeShape.idl
index 8949d6f2d1ba..6e08cad1fb69 100644
--- a/offapi/com/sun/star/presentation/DateTimeShape.idl
+++ b/offapi/com/sun/star/presentation/DateTimeShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_DateTimeShape_idl__
#define __com_sun_star_presentation_DateTimeShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/DocumentSettings.idl b/offapi/com/sun/star/presentation/DocumentSettings.idl
index 22bb3ed7238b..549f3ae27db0 100644
--- a/offapi/com/sun/star/presentation/DocumentSettings.idl
+++ b/offapi/com/sun/star/presentation/DocumentSettings.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_presentation_DocumentSettings_idl__
#define __com_sun_star_presentation_DocumentSettings_idl__
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
#include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/DrawPage.idl b/offapi/com/sun/star/presentation/DrawPage.idl
index 14c0cd7b1647..c1b88f2cb56c 100644
--- a/offapi/com/sun/star/presentation/DrawPage.idl
+++ b/offapi/com/sun/star/presentation/DrawPage.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_presentation_DrawPage_idl__
#define __com_sun_star_presentation_DrawPage_idl__
-#ifndef __com_sun_star_drawing_DrawPage_idl__
#include <com/sun/star/drawing/DrawPage.idl>
-#endif
-#ifndef __com_sun_star_document_LinkTarget_idl__
#include <com/sun/star/document/LinkTarget.idl>
-#endif
-#ifndef __com_sun_star_presentation_FadeEffect_idl__
#include <com/sun/star/presentation/FadeEffect.idl>
-#endif
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
#include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/FooterShape.idl b/offapi/com/sun/star/presentation/FooterShape.idl
index 91b6bad681e2..024304e80e3d 100644
--- a/offapi/com/sun/star/presentation/FooterShape.idl
+++ b/offapi/com/sun/star/presentation/FooterShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_FooterShape_idl__
#define __com_sun_star_presentation_FooterShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/GraphicObjectShape.idl b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
index 6171234401c3..ad3c78d6b904 100644
--- a/offapi/com/sun/star/presentation/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_GraphicObjectShape_idl__
#define __com_sun_star_presentation_GraphicObjectShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
#include <com/sun/star/drawing/GraphicObjectShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/HandoutShape.idl b/offapi/com/sun/star/presentation/HandoutShape.idl
index 027c0fc26251..8e4ffc8e996e 100644
--- a/offapi/com/sun/star/presentation/HandoutShape.idl
+++ b/offapi/com/sun/star/presentation/HandoutShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_HandoutShape_idl__
#define __com_sun_star_presentation_HandoutShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_PageShape_idl__
#include <com/sun/star/drawing/PageShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/HandoutView.idl b/offapi/com/sun/star/presentation/HandoutView.idl
index 4312280f3cb6..ff85ecc9e87c 100644
--- a/offapi/com/sun/star/presentation/HandoutView.idl
+++ b/offapi/com/sun/star/presentation/HandoutView.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_HandoutView_idl__
#define __com_sun_star_presentation_HandoutView_idl__
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
#include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/HeaderShape.idl b/offapi/com/sun/star/presentation/HeaderShape.idl
index 2eabe32a309b..7c9887be30bb 100644
--- a/offapi/com/sun/star/presentation/HeaderShape.idl
+++ b/offapi/com/sun/star/presentation/HeaderShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_HeaderShape_idl__
#define __com_sun_star_presentation_HeaderShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/NotesShape.idl b/offapi/com/sun/star/presentation/NotesShape.idl
index e191d3748e6a..32fa6a188cbc 100644
--- a/offapi/com/sun/star/presentation/NotesShape.idl
+++ b/offapi/com/sun/star/presentation/NotesShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_NotesShape_idl__
#define __com_sun_star_presentation_NotesShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/NotesView.idl b/offapi/com/sun/star/presentation/NotesView.idl
index 0d63cc63941b..631319fa132a 100644
--- a/offapi/com/sun/star/presentation/NotesView.idl
+++ b/offapi/com/sun/star/presentation/NotesView.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_NotesView_idl__
#define __com_sun_star_presentation_NotesView_idl__
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
#include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/OLE2Shape.idl b/offapi/com/sun/star/presentation/OLE2Shape.idl
index dae7714b89a0..1af3855df8bb 100644
--- a/offapi/com/sun/star/presentation/OLE2Shape.idl
+++ b/offapi/com/sun/star/presentation/OLE2Shape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_OLE2Shape_idl__
#define __com_sun_star_presentation_OLE2Shape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
#include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl
index 13b12976f3ae..703cfa04ce04 100644
--- a/offapi/com/sun/star/presentation/OutlineView.idl
+++ b/offapi/com/sun/star/presentation/OutlineView.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_presentation_OutlineView_idl__
#define __com_sun_star_presentation_OutlineView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/OutlinerShape.idl b/offapi/com/sun/star/presentation/OutlinerShape.idl
index 84678d23edf9..a8ff7c8dcdc0 100644
--- a/offapi/com/sun/star/presentation/OutlinerShape.idl
+++ b/offapi/com/sun/star/presentation/OutlinerShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_OutlinerShape_idl__
#define __com_sun_star_presentation_OutlinerShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/PageShape.idl b/offapi/com/sun/star/presentation/PageShape.idl
index 27e2c15c1eff..a79f27ce91fd 100644
--- a/offapi/com/sun/star/presentation/PageShape.idl
+++ b/offapi/com/sun/star/presentation/PageShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_PageShape_idl__
#define __com_sun_star_presentation_PageShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_PageShape_idl__
#include <com/sun/star/drawing/PageShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/ParagraphTarget.idl b/offapi/com/sun/star/presentation/ParagraphTarget.idl
index 755f10d835f0..00adaf7bae1f 100644
--- a/offapi/com/sun/star/presentation/ParagraphTarget.idl
+++ b/offapi/com/sun/star/presentation/ParagraphTarget.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_ParagraphTarget_idl__
#define __com_sun_star_presentation_ParagraphTarget_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/Presentation.idl b/offapi/com/sun/star/presentation/Presentation.idl
index e8c220b00ff7..a69fae575e8d 100644
--- a/offapi/com/sun/star/presentation/Presentation.idl
+++ b/offapi/com/sun/star/presentation/Presentation.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_Presentation_idl__
#define __com_sun_star_presentation_Presentation_idl__
-#ifndef __com_sun_star_presentation_XPresentation_idl__
#include <com/sun/star/presentation/XPresentation.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/Presentation2.idl b/offapi/com/sun/star/presentation/Presentation2.idl
index 9ed9a9b0dd23..394a8a3a5fe4 100644
--- a/offapi/com/sun/star/presentation/Presentation2.idl
+++ b/offapi/com/sun/star/presentation/Presentation2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_presentation_Presentation2_idl__
#define __com_sun_star_presentation_Presentation2_idl__
-#ifndef __com_sun_star_presentation_Presentation_idl__
#include <com/sun/star/presentation/Presentation.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentation2_idl__
#include <com/sun/star/presentation/XPresentation2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index 401090dd09c2..f24a2c49ed31 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_presentation_PresentationDocument_idl__
#define __com_sun_star_presentation_PresentationDocument_idl__
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
#include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
#include <com/sun/star/presentation/XPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
#include <com/sun/star/presentation/XCustomPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
#include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl
index e989b8b075de..49ecb5111f1a 100644
--- a/offapi/com/sun/star/presentation/PresentationView.idl
+++ b/offapi/com/sun/star/presentation/PresentationView.idl
@@ -27,29 +27,15 @@
#ifndef __com_sun_star_presentation_PresentationView_idl__
#define __com_sun_star_presentation_PresentationView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl
index 976b9b72193a..d4181c0520f1 100644
--- a/offapi/com/sun/star/presentation/PreviewView.idl
+++ b/offapi/com/sun/star/presentation/PreviewView.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_presentation_PreviewView_idl__
#define __com_sun_star_presentation_PreviewView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/Shape.idl b/offapi/com/sun/star/presentation/Shape.idl
index f16c7a60e574..8744d2b2de15 100644
--- a/offapi/com/sun/star/presentation/Shape.idl
+++ b/offapi/com/sun/star/presentation/Shape.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_presentation_Shape_idl__
#define __com_sun_star_presentation_Shape_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_AnimationEffect_idl__
#include <com/sun/star/presentation/AnimationEffect.idl>
-#endif
-#ifndef __com_sun_star_presentation_ClickAction_idl__
#include <com/sun/star/presentation/ClickAction.idl>
-#endif
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
#include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/SlideNumberShape.idl b/offapi/com/sun/star/presentation/SlideNumberShape.idl
index 1a5375e2ce3b..41b27edb1720 100644
--- a/offapi/com/sun/star/presentation/SlideNumberShape.idl
+++ b/offapi/com/sun/star/presentation/SlideNumberShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_SlideNumberShape_idl__
#define __com_sun_star_presentation_SlideNumberShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl
index c984281b1819..ed35eac1285a 100644
--- a/offapi/com/sun/star/presentation/SlidesView.idl
+++ b/offapi/com/sun/star/presentation/SlidesView.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_presentation_SlidesView_idl__
#define __com_sun_star_presentation_SlidesView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/SubtitleShape.idl b/offapi/com/sun/star/presentation/SubtitleShape.idl
index 3bb28ba0dcb7..1ea28e800387 100644
--- a/offapi/com/sun/star/presentation/SubtitleShape.idl
+++ b/offapi/com/sun/star/presentation/SubtitleShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_SubtitleShape_idl__
#define __com_sun_star_presentation_SubtitleShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/TitleTextShape.idl b/offapi/com/sun/star/presentation/TitleTextShape.idl
index f2856eeedf26..edbc6155f0c8 100644
--- a/offapi/com/sun/star/presentation/TitleTextShape.idl
+++ b/offapi/com/sun/star/presentation/TitleTextShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_TitleTextShape_idl__
#define __com_sun_star_presentation_TitleTextShape_idl__
-#ifndef __com_sun_star_presentation_Shape_idl__
#include <com/sun/star/presentation/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextShape_idl__
#include <com/sun/star/drawing/TextShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
index 3949c9157932..e109afcbece7 100644
--- a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
#define __com_sun_star_presentation_XCustomPresentationSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
index c55af24981d3..4582fdc1b21c 100644
--- a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
+++ b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_XHandoutMasterSupplier_idl__
#define __com_sun_star_presentation_XHandoutMasterSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentation.idl b/offapi/com/sun/star/presentation/XPresentation.idl
index 16c5715edff9..5a793ccdea42 100644
--- a/offapi/com/sun/star/presentation/XPresentation.idl
+++ b/offapi/com/sun/star/presentation/XPresentation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_XPresentation_idl__
#define __com_sun_star_presentation_XPresentation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentation2.idl b/offapi/com/sun/star/presentation/XPresentation2.idl
index 53e6ef4137d6..920ede40f6e7 100644
--- a/offapi/com/sun/star/presentation/XPresentation2.idl
+++ b/offapi/com/sun/star/presentation/XPresentation2.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_presentation_XPresentation2_idl__
#define __com_sun_star_presentation_XPresentation2_idl__
-#ifndef __com_sun_star_presentation_XPresentation_idl__
#include <com/sun/star/presentation/XPresentation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
#include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowController_idl__
#include <com/sun/star/presentation/XSlideShowController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentationPage.idl b/offapi/com/sun/star/presentation/XPresentationPage.idl
index ca41ed35c220..2148a86ff1de 100644
--- a/offapi/com/sun/star/presentation/XPresentationPage.idl
+++ b/offapi/com/sun/star/presentation/XPresentationPage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_XPresentationPage_idl__
#define __com_sun_star_presentation_XPresentationPage_idl__
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentationSupplier.idl b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
index f014ad9b379e..3b7b080598e5 100644
--- a/offapi/com/sun/star/presentation/XPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
#define __com_sun_star_presentation_XPresentationSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_presentation_XPresentation_idl__
#include <com/sun/star/presentation/XPresentation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XShapeEventListener.idl b/offapi/com/sun/star/presentation/XShapeEventListener.idl
index d2578ea8dfbe..1639bde8967a 100644
--- a/offapi/com/sun/star/presentation/XShapeEventListener.idl
+++ b/offapi/com/sun/star/presentation/XShapeEventListener.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
#define __com_sun_star_presentation_XShapeEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
#include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
module com { module sun { module star { module presentation {
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index 6d3ff2a308b8..e8fec3b1974b 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -27,42 +27,18 @@
#ifndef _com_sun_star_presentation_XSlideShow_idl
#define _com_sun_star_presentation_XSlideShow_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowView_idl__
#include <com/sun/star/presentation/XSlideShowView.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
#include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
#include <com/sun/star/presentation/XShapeEventListener.idl>
-#endif
module com { module sun { module star { module presentation {
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index e55d7dcadfb0..5f143c061112 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_presentation_XSlideShowController_idl__
#define __com_sun_star_presentation_XSlideShowController_idl__
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShow_idl__
#include <com/sun/star/presentation/XSlideShow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index 17d7cd7b5370..50a7d7c9afaf 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
#define __com_sun_star_presentation_XSlideShowListener_idl__
-#ifndef __com_sun_star_animations_XAnimationListener_idl__
#include <com/sun/star/animations/XAnimationListener.idl>
-#endif
module com { module sun { module star { module presentation {
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index f4873a5e6865..c427f04c088b 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_presentation_XSlideShowView_idl__
#define __com_sun_star_presentation_XSlideShowView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyListener_idl__
#include <com/sun/star/util/XModifyListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XPaintListener_idl__
#include <com/sun/star/awt/XPaintListener.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_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
module com { module sun { module star { module presentation {
diff --git a/offapi/com/sun/star/presentation/XTransition.idl b/offapi/com/sun/star/presentation/XTransition.idl
index ddd201b05e0b..39f02fc9f5cf 100644
--- a/offapi/com/sun/star/presentation/XTransition.idl
+++ b/offapi/com/sun/star/presentation/XTransition.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_presentation_XTransition_idl__
#define __com_sun_star_presentation_XTransition_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star {
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 89fa8871a6a1..3f648353fff6 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_presentation_XTransitionFactory_idl__
#define __com_sun_star_presentation_XTransitionFactory_idl__
-#ifndef __com_sun_star_presentation_XTransition_idl__
#include <com/sun/star/presentation/XTransition.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
module com { module sun { module star {
diff --git a/offapi/com/sun/star/rdf/BlankNode.idl b/offapi/com/sun/star/rdf/BlankNode.idl
index 5829a3f02e9f..c093877bf812 100644
--- a/offapi/com/sun/star/rdf/BlankNode.idl
+++ b/offapi/com/sun/star/rdf/BlankNode.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_rdf_BlankNode_idl__
#define __com_sun_star_rdf_BlankNode_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
#include <com/sun/star/rdf/XBlankNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/Literal.idl b/offapi/com/sun/star/rdf/Literal.idl
index 17a197534c65..5ed0823dc181 100644
--- a/offapi/com/sun/star/rdf/Literal.idl
+++ b/offapi/com/sun/star/rdf/Literal.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_rdf_Literal_idl__
#define __com_sun_star_rdf_Literal_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XLiteral_idl__
#include <com/sun/star/rdf/XLiteral.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/ParseException.idl b/offapi/com/sun/star/rdf/ParseException.idl
index 07a537456ffb..00517dd79745 100644
--- a/offapi/com/sun/star/rdf/ParseException.idl
+++ b/offapi/com/sun/star/rdf/ParseException.idl
@@ -28,10 +28,7 @@
#ifndef __com_sun_star_rdf_ParseException_idl__
#define __com_sun_star_rdf_ParseException_idl__
-#ifndef __com_sun_star_uno_Eception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/QueryException.idl b/offapi/com/sun/star/rdf/QueryException.idl
index 1b1053bb4288..fa6a739ddb66 100644
--- a/offapi/com/sun/star/rdf/QueryException.idl
+++ b/offapi/com/sun/star/rdf/QueryException.idl
@@ -28,10 +28,7 @@
#ifndef __com_sun_star_rdf_QueryException_idl__
#define __com_sun_star_rdf_QueryException_idl__
-#ifndef __com_sun_star_uno_Eception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/Repository.idl b/offapi/com/sun/star/rdf/Repository.idl
index 5911d4dfe473..c2a9fde21403 100644
--- a/offapi/com/sun/star/rdf/Repository.idl
+++ b/offapi/com/sun/star/rdf/Repository.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_Repository_idl__
#define __com_sun_star_rdf_Repository_idl__
-#ifndef __com_sun_star_rdf_XRepository_idl__
#include <com/sun/star/rdf/XRepository.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/RepositoryException.idl b/offapi/com/sun/star/rdf/RepositoryException.idl
index 694b32999f50..6f05c0d1ebb1 100644
--- a/offapi/com/sun/star/rdf/RepositoryException.idl
+++ b/offapi/com/sun/star/rdf/RepositoryException.idl
@@ -28,10 +28,7 @@
#ifndef __com_sun_star_rdf_RepositoryException_idl__
#define __com_sun_star_rdf_RepositoryException_idl__
-#ifndef __com_sun_star_uno_Eception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/Statement.idl b/offapi/com/sun/star/rdf/Statement.idl
index 3979103fd4df..b144ca45b39c 100644
--- a/offapi/com/sun/star/rdf/Statement.idl
+++ b/offapi/com/sun/star/rdf/Statement.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_Statement_idl__
#define __com_sun_star_rdf_Statement_idl__
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/URI.idl b/offapi/com/sun/star/rdf/URI.idl
index a0a785c96a65..73d45c97219e 100644
--- a/offapi/com/sun/star/rdf/URI.idl
+++ b/offapi/com/sun/star/rdf/URI.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_rdf_URI_idl__
#define __com_sun_star_rdf_URI_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XBlankNode.idl b/offapi/com/sun/star/rdf/XBlankNode.idl
index d63a4bd93a00..e1ffe829f446 100644
--- a/offapi/com/sun/star/rdf/XBlankNode.idl
+++ b/offapi/com/sun/star/rdf/XBlankNode.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XBlankNode_idl__
#define __com_sun_star_rdf_XBlankNode_idl__
-#ifndef __com_sun_star_rdf_XResource_idl__
#include <com/sun/star/rdf/XResource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
index f8bbade4ef74..b5410b5218e2 100644
--- a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
+++ b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
@@ -28,65 +28,21 @@
#ifndef __com_sun_star_rdf_XDocumentMetadataAccess_idl__
#define __com_sun_star_rdf_XDocumentMetadataAccess_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
#include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
#include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
#include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
#include <com/sun/star/rdf/XRepositorySupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index 215fd89fa954..a4a07165494c 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_rdf_XDocumentRepository_idl__
#define __com_sun_star_rdf_XDocumentRepository_idl__
-#ifndef __com_sun_star_beans_Pair_idl__
#include <com/sun/star/beans/Pair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
#include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepository_idl__
#include <com/sun/star/rdf/XRepository.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XLiteral.idl b/offapi/com/sun/star/rdf/XLiteral.idl
index 148809107212..fe06568ce6cb 100644
--- a/offapi/com/sun/star/rdf/XLiteral.idl
+++ b/offapi/com/sun/star/rdf/XLiteral.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XLiteral_idl__
#define __com_sun_star_rdf_XLiteral_idl__
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index e7f01d9c05ba..4267d8472138 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_rdf_XMetadatable_idl__
#define __com_sun_star_rdf_XMetadatable_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNamedGraph.idl b/offapi/com/sun/star/rdf/XNamedGraph.idl
index d71c5a599e9e..e750f601e437 100644
--- a/offapi/com/sun/star/rdf/XNamedGraph.idl
+++ b/offapi/com/sun/star/rdf/XNamedGraph.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_rdf_XNamedGraph_idl__
#define __com_sun_star_rdf_XNamedGraph_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
#include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index 0c7f70d5e4f7..0fe38a0166da 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XNode_idl__
#define __com_sun_star_rdf_XNode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index 19ceecaf36d1..b991a4f839a9 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
#define __com_sun_star_rdf_XQuerySelectResult_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XReifiedStatement.idl b/offapi/com/sun/star/rdf/XReifiedStatement.idl
index 9f697552aa6e..f6ff278e1573 100644
--- a/offapi/com/sun/star/rdf/XReifiedStatement.idl
+++ b/offapi/com/sun/star/rdf/XReifiedStatement.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XReifiedStatement_idl__
#define __com_sun_star_rdf_XReifiedStatement_idl__
-#ifndef __com_sun_star_rdf_Statement_idl__
#include <com/sun/star/rdf/Statement.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index 1b76ff1158a7..75dfcacbbf1a 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -28,73 +28,23 @@
#ifndef __com_sun_star_rdf_XRepository_idl__
#define __com_sun_star_rdf_XRepository_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
#include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
#include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_QueryException_idl__
#include <com/sun/star/rdf/QueryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
#include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
#include <com/sun/star/rdf/XBlankNode.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
#include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_Statement_idl__
#include <com/sun/star/rdf/Statement.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
#include <com/sun/star/rdf/XQuerySelectResult.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XNamedGraph_idl__
#include <com/sun/star/rdf/XNamedGraph.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepositorySupplier.idl b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
index 15984a9438d4..91c7ffa4ee98 100644
--- a/offapi/com/sun/star/rdf/XRepositorySupplier.idl
+++ b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
#define __com_sun_star_rdf_XRepositorySupplier_idl__
-#ifndef __com_sun_star_rdf_XRepository_idl__
#include <com/sun/star/rdf/XRepository.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index 3c10b586fd78..9ab4cf30f092 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XResource_idl__
#define __com_sun_star_rdf_XResource_idl__
-#ifndef __com_sun_star_rdf_XNode_idl__
#include <com/sun/star/rdf/XNode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index 6ba59cec0dd6..ac9ce5d0cd2a 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rdf_XURI_idl__
#define __com_sun_star_rdf_XURI_idl__
-#ifndef __com_sun_star_rdf_XResource_idl__
#include <com/sun/star/rdf/XResource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rendering/AnimationAttributes.idl b/offapi/com/sun/star/rendering/AnimationAttributes.idl
index a208aff1ee0f..99143c097f1f 100644
--- a/offapi/com/sun/star/rendering/AnimationAttributes.idl
+++ b/offapi/com/sun/star/rendering/AnimationAttributes.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_rendering_AnimationAttributes_idl__
#define __com_sun_star_rendering_AnimationAttributes_idl__
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
#include <com/sun/star/geometry/RealSize2D.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
index 714a20e8bf3e..a68951de1956 100644
--- a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#define __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
-#ifndef __com_sun_star_rendering_FloatingPointBitmapFormat_idl__
#include <com/sun/star/rendering/FloatingPointBitmapFormat.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/FontInfo.idl b/offapi/com/sun/star/rendering/FontInfo.idl
index 6c00c2c2ff93..b3f02f31297c 100644
--- a/offapi/com/sun/star/rendering/FontInfo.idl
+++ b/offapi/com/sun/star/rendering/FontInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_rendering_FontInfo_idl__
#define __com_sun_star_rendering_FontInfo_idl__
-#ifndef __com_sun_star_util_TriState_idl__
#include <com/sun/star/util/TriState.idl>
-#endif
-
-#ifndef __com_sun_star_rendering_Panose_idl__
#include <com/sun/star/rendering/Panose.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/FontRequest.idl b/offapi/com/sun/star/rendering/FontRequest.idl
index 0a5caa06ee18..f654343b175e 100644
--- a/offapi/com/sun/star/rendering/FontRequest.idl
+++ b/offapi/com/sun/star/rendering/FontRequest.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_rendering_FontRequest_idl__
#define __com_sun_star_rendering_FontRequest_idl__
-#ifndef __com_sun_star_rendering_FontInfo_idl__
#include <com/sun/star/rendering/FontInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
index fae628f0d9b6..c51d8edb1b76 100644
--- a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
#define __com_sun_star_rendering_IntegerBitmapLayout_idl__
-#ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
#include <com/sun/star/rendering/XIntegerBitmapColorSpace.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapPalette_idl__
#include <com/sun/star/rendering/XBitmapPalette.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/MtfRenderer.idl b/offapi/com/sun/star/rendering/MtfRenderer.idl
index dbcc850c3e1c..af07f0a1d391 100644
--- a/offapi/com/sun/star/rendering/MtfRenderer.idl
+++ b/offapi/com/sun/star/rendering/MtfRenderer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_rendering_MtfRenderer_idl__
#define __com_sun_star_rendering_MtfRenderer_idl__
-#ifndef __com_sun_star_uno_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/RenderState.idl b/offapi/com/sun/star/rendering/RenderState.idl
index ecb5b169d3a3..e2b73ddfdf4e 100644
--- a/offapi/com/sun/star/rendering/RenderState.idl
+++ b/offapi/com/sun/star/rendering/RenderState.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_RenderState_idl__
#define __com_sun_star_rendering_RenderState_idl__
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
#include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl
index 22c9e7b341b3..05120f63730c 100644
--- a/offapi/com/sun/star/rendering/StrokeAttributes.idl
+++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
#define __com_sun_star_rendering_StrokeAttributes_idl__
-#ifndef __com_sun_star_rendering_PathCapType_idl__
#include <com/sun/star/rendering/PathCapType.idl>
-#endif
-#ifndef __com_sun_star_rendering_PathJoinType_idl__
#include <com/sun/star/rendering/PathJoinType.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/Texture.idl b/offapi/com/sun/star/rendering/Texture.idl
index ea033b3e21a8..f81179d2f7ef 100644
--- a/offapi/com/sun/star/rendering/Texture.idl
+++ b/offapi/com/sun/star/rendering/Texture.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_Texture_idl__
#define __com_sun_star_rendering_Texture_idl__
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
#include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
#include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/ViewState.idl b/offapi/com/sun/star/rendering/ViewState.idl
index fe4de1fc17bf..bd82489d62cb 100644
--- a/offapi/com/sun/star/rendering/ViewState.idl
+++ b/offapi/com/sun/star/rendering/ViewState.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_rendering_ViewState_idl__
#define __com_sun_star_rendering_ViewState_idl__
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
#include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
index 718444f91a25..b33238208707 100644
--- a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
+++ b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#define __com_sun_star_rendering_VolatileContentDestroyedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XAnimatedSprite.idl b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
index 9db5b0e6d6f5..240d4297e870 100644
--- a/offapi/com/sun/star/rendering/XAnimatedSprite.idl
+++ b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_rendering_XAnimatedSprite_idl__
#define __com_sun_star_rendering_XAnimatedSprite_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
#include <com/sun/star/rendering/XSprite.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XAnimation.idl b/offapi/com/sun/star/rendering/XAnimation.idl
index 26ee03e3cb87..184465033d0f 100644
--- a/offapi/com/sun/star/rendering/XAnimation.idl
+++ b/offapi/com/sun/star/rendering/XAnimation.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_rendering_XAnimation_idl__
#define __com_sun_star_rendering_XAnimation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_AnimationAttributes_idl__
#include <com/sun/star/rendering/AnimationAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
index 1d57ccea9e8a..1113e6c5212e 100644
--- a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
#define __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
-#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_rendering_XPolyPolygon2D_idl__
#include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
#include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl
index c061d2908f2e..5e84be43db86 100644
--- a/offapi/com/sun/star/rendering/XBitmap.idl
+++ b/offapi/com/sun/star/rendering/XBitmap.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_rendering_XBitmap_idl__
#define __com_sun_star_rendering_XBitmap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
#include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
#include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index fed3cd4238dc..75e0ba0139ac 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
#define __com_sun_star_rendering_XBitmapCanvas_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBitmapPalette.idl b/offapi/com/sun/star/rendering/XBitmapPalette.idl
index f36629285d9a..23a9ff8a6668 100644
--- a/offapi/com/sun/star/rendering/XBitmapPalette.idl
+++ b/offapi/com/sun/star/rendering/XBitmapPalette.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XBitmapPalette_idl__
#define __com_sun_star_rendering_XBitmapPalette_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.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
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBufferController.idl b/offapi/com/sun/star/rendering/XBufferController.idl
index f90f6b8a31c7..2c741d3d4263 100644
--- a/offapi/com/sun/star/rendering/XBufferController.idl
+++ b/offapi/com/sun/star/rendering/XBufferController.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_rendering_XBufferController_idl__
#define __com_sun_star_rendering_XBufferController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XCachedPrimitive.idl b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
index 9793374ad913..9a4edb0aa71e 100644
--- a/offapi/com/sun/star/rendering/XCachedPrimitive.idl
+++ b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_rendering_XCachedPrimitive_idl__
#define __com_sun_star_rendering_XCachedPrimitive_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 78658a11f0f8..deb639e0b5d6 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -27,52 +27,21 @@
#ifndef __com_sun_star_rendering_XCanvas_idl__
#define __com_sun_star_rendering_XCanvas_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
#include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_Matrix2D_idl__
#include <com/sun/star/geometry/Matrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
#include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontInfo_idl__
#include <com/sun/star/rendering/FontInfo.idl>
-#endif
-#ifndef __com_sun_star_rendering_Texture_idl__
#include <com/sun/star/rendering/Texture.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
#include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
#include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module geometry {
diff --git a/offapi/com/sun/star/rendering/XCanvasFont.idl b/offapi/com/sun/star/rendering/XCanvasFont.idl
index face4c16cee9..5912659769e8 100644
--- a/offapi/com/sun/star/rendering/XCanvasFont.idl
+++ b/offapi/com/sun/star/rendering/XCanvasFont.idl
@@ -27,34 +27,15 @@
#ifndef __com_sun_star_rendering_XCanvasFont_idl__
#define __com_sun_star_rendering_XCanvasFont_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
#include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
#include <com/sun/star/rendering/FontMetrics.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
#include <com/sun/star/rendering/StringContext.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index bb20e50e8fdd..c2fc47583ae9 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XColorSpace_idl__
#define __com_sun_star_rendering_XColorSpace_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_rendering_ColorProfile_idl__
#include <com/sun/star/rendering/ColorProfile.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XCustomSprite.idl b/offapi/com/sun/star/rendering/XCustomSprite.idl
index e02f3c62df84..32e332a90645 100644
--- a/offapi/com/sun/star/rendering/XCustomSprite.idl
+++ b/offapi/com/sun/star/rendering/XCustomSprite.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XCustomSprite_idl__
#define __com_sun_star_rendering_XCustomSprite_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
#include <com/sun/star/rendering/XSprite.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index 411ae6d5cb40..071d06662bcd 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_rendering_XGraphicDevice_idl__
#define __com_sun_star_rendering_XGraphicDevice_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
#include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
#include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
#include <com/sun/star/rendering/XLinePolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
#include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
index e23ec8420388..df0013f23f65 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XHalfFloatBitmap_idl__
#define __com_sun_star_rendering_XHalfFloatBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
#include <com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
index 166f38425d5c..45b19c9c0207 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
#define __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
index bdb8b657e625..382386cdca8e 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
#define __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
#include <com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
index 9c992f0c257a..1e0a4c4dad54 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
#define __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
index 6fd9f9552e9b..79b226814064 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XIeeeFloatBitmap_idl__
#define __com_sun_star_rendering_XIeeeFloatBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
#include <com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
index bdb966d01600..ec76f0a9c783 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
#define __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
-#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
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
#include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmap.idl b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
index b416d30debd1..38f5712df9c6 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_rendering_XIntegerBitmap_idl__
#define __com_sun_star_rendering_XIntegerBitmap_idl__
-#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
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
#include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
index 6b5e9f989999..5a40632b1e05 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
#define __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
index 1e9166db47b9..92a240ad3fc2 100644
--- a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
#define __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
-#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
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
#include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
#include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
#include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
index bbd2606297ba..bef010fe64b6 100644
--- a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
#define __com_sun_star_rendering_XLinePolyPolygon2D_idl__
-#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_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
#include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
index 4f29186be31e..d63e61d7211d 100644
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
#define __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
#include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
index 97319e9ce8d9..04953a2a74ce 100644
--- a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
#define __com_sun_star_rendering_XPolyPolygon2D_idl__
-#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_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FillRule_idl__
#include <com/sun/star/rendering/FillRule.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XSimpleCanvas.idl b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
index 33626853e80a..50c591a86342 100644
--- a/offapi/com/sun/star/rendering/XSimpleCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_rendering_XSimpleCanvas_idl__
#define __com_sun_star_rendering_XSimpleCanvas_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
#include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
#include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
#include <com/sun/star/rendering/FontMetrics.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index ea33cbdbab76..d97555f856c2 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_rendering_XSprite_idl__
#define __com_sun_star_rendering_XSprite_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
#include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
index cc534013861a..0802ba1acdfb 100644
--- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#define __com_sun_star_rendering_XSpriteCanvas_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
#include <com/sun/star/rendering/XBitmapCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XAnimation_idl__
#include <com/sun/star/rendering/XAnimation.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
#include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XTextLayout.idl b/offapi/com/sun/star/rendering/XTextLayout.idl
index 0861d547bf13..0c9eb0495622 100644
--- a/offapi/com/sun/star/rendering/XTextLayout.idl
+++ b/offapi/com/sun/star/rendering/XTextLayout.idl
@@ -27,39 +27,17 @@
#ifndef __com_sun_star_rendering_XTextLayout_idl__
#define __com_sun_star_rendering_XTextLayout_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.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
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
#include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
#include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
#include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_TextHit_idl__
#include <com/sun/star/rendering/TextHit.idl>
-#endif
-#ifndef __com_sun_star_rendering_Caret_idl__
#include <com/sun/star/rendering/Caret.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XVolatileBitmap.idl b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
index 2597243f5505..4d6555b6b348 100644
--- a/offapi/com/sun/star/rendering/XVolatileBitmap.idl
+++ b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_rendering_XVolatileBitmap_idl__
#define __com_sun_star_rendering_XVolatileBitmap_idl__
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index f1f44f5fcf1a..5a1b080ec808 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -27,23 +27,12 @@
#ifndef __com_sun_star_report_XFixedLine_idl__
#define __com_sun_star_report_XFixedLine_idl__
-#ifndef __com_sun_star_report_XReportControlModel_idl__
#include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_CircleKind_idl__
#include <com/sun/star/drawing/CircleKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineStyle_idl__
#include <com/sun/star/drawing/LineStyle.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
#include <com/sun/star/drawing/LineDash.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 8c10e1935548..7e0224ba653d 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_report_XFixedText_idl__
#define __com_sun_star_report_XFixedText_idl__
-#ifndef __com_sun_star_report_XReportControlModel_idl__
#include <com/sun/star/report/XReportControlModel.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 187c1b524af2..403d8e0e47fc 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_report_XFormatCondition_idl__
#define __com_sun_star_report_XFormatCondition_idl__
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
#include <com/sun/star/report/XReportControlFormat.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 5de71ec50b64..e1ff1eedad78 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_report_XFormattedField_idl__
#define __com_sun_star_report_XFormattedField_idl__
-#ifndef __com_sun_star_report_XReportControlModel_idl__
#include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index deddd0d905dc..a688cab999e2 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_report_XFunction_idl__
#define __com_sun_star_report_XFunction_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
//=============================================================================
diff --git a/offapi/com/sun/star/report/XFunctions.idl b/offapi/com/sun/star/report/XFunctions.idl
index 5a6ab1e8930f..dba5fec7cc35 100644
--- a/offapi/com/sun/star/report/XFunctions.idl
+++ b/offapi/com/sun/star/report/XFunctions.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_report_XFunctions_idl__
#define __com_sun_star_report_XFunctions_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XFunctionsSupplier.idl b/offapi/com/sun/star/report/XFunctionsSupplier.idl
index 63d5cda66e97..59181f6b2d48 100644
--- a/offapi/com/sun/star/report/XFunctionsSupplier.idl
+++ b/offapi/com/sun/star/report/XFunctionsSupplier.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_report_XFunctionsSupplier_idl__
#define __com_sun_star_report_XFunctionsSupplier_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
//=============================================================================
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 469889ff6c7a..39d3aebe0de6 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_report_XGroup_idl__
#define __com_sun_star_report_XGroup_idl__
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_report_XSection_idl__
#include <com/sun/star/report/XSection.idl>
-#endif
-#ifndef __com_sun_star_report_XGroups_idl__
#include <com/sun/star/report/XGroups.idl>
-#endif
#include <com/sun/star/report/XFunctions.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index ee2324f10855..dc8d567355f0 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_report_XGroups_idl__
#define __com_sun_star_report_XGroups_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index 48c18cb0b864..d222e3a13c34 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_report_XImageControl_idl__
#define __com_sun_star_report_XImageControl_idl__
-#ifndef __com_sun_star_report_XReportControlModel_idl__
#include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index 11e6582d8bdd..588b9aca770e 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -27,30 +27,16 @@
#ifndef __com_sun_star_report_XReportComponent_idl__
#define __com_sun_star_report_XReportComponent_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 2c28f5fcc570..0afab43ce2d4 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_report_XReportControlModel_idl__
#define __com_sun_star_report_XReportControlModel_idl__
-#ifndef __com_sun_star_report_XReportComponent_idl__
#include <com/sun/star/report/XReportComponent.idl>
-#endif
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
#include <com/sun/star/report/XReportControlFormat.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_report_XFormatCondition_idl__
#include <com/sun/star/report/XFormatCondition.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index d56b8a106e89..839ecbc1f2e6 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -27,63 +27,25 @@
#ifndef __com_sun_star_report_XReportDefinition_idl__
#define __com_sun_star_report_XReportDefinition_idl__
-#ifndef __com_sun_star_report_XReportComponent_idl__
#include <com/sun/star/report/XReportComponent.idl>
-#endif
-#ifndef __com_sun_star_report_XFunctionsSupplier_idl__
#include <com/sun/star/report/XFunctionsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__
#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_view_PaperFormat_idl__
#include <com/sun/star/view/PaperFormat.idl>
-#endif
-#ifndef __com_sun_star_util_XClosable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
-#ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
#include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_document_XViewDataSupplier_idl__
#include <com/sun/star/document/XViewDataSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
#include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_embed_XVisualObject_idl__
#include <com/sun/star/embed/XVisualObject.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
#include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_XModifiable2_idl__
#include <com/sun/star/util/XModifiable2.idl>
-#endif
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
#include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index 7c18a0e2a4e7..87f11565bcc0 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -27,39 +27,17 @@
#ifndef __com_sun_star_report_XReportEngine_idl__
#define __com_sun_star_report_XReportEngine_idl__
-#ifndef __com_sun_star_report_XReportDefinition_idl__
#include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
#include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
#include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index 606b05eded44..e4d51be429b7 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_report_XSection_idl__
#define __com_sun_star_report_XSection_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_report_XReportDefinition_idl__
#include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_report_XReportComponent_idl__
#include <com/sun/star/report/XReportComponent.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index cd2f6f12c3cf..42100071cc94 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_report_XShape_idl__
#define __com_sun_star_report_XShape_idl__
-#ifndef __com_sun_star_report_XReportControlModel_idl__
#include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
#include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
//=============================================================================
module com { module sun { module star { module report {
diff --git a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
index a7348b5aca9d..6403baf031ec 100644
--- a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
+++ b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_report_inspection_DataProviderHandler_idl__
#define __com_sun_star_report_inspection_DataProviderHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 0595f4b8e224..ae312c858e99 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_report_inspection__DefaultComponentInspectorModel_idl__
#define __com_sun_star_report_inspection_DefaultComponentInspectorModel_idl__
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
index 132cbab1eccb..b7bbffd48c63 100644
--- a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
+++ b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_report_inspection_ReportComponentHandler_idl__
#define __com_sun_star_report_inspection_ReportComponentHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl
index 7453f89c8e96..25046a487f30 100644
--- a/offapi/com/sun/star/resource/MissingResourceException.idl
+++ b/offapi/com/sun/star/resource/MissingResourceException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_resource_MissingResourceException_idl__
#define __com_sun_star_resource_MissingResourceException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
index 1d9d00925e34..4dd22fa98402 100644
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_resource_OfficeResourceLoader_idl__
#define __com_sun_star_resource_OfficeResourceLoader_idl__
-#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
#include <com/sun/star/resource/XResourceBundleLoader.idl>
-#endif
//=============================================================================
module com { module sun { module star { module resource {
diff --git a/offapi/com/sun/star/resource/StringResource.idl b/offapi/com/sun/star/resource/StringResource.idl
index 2c53e6a3cdc2..f4b25749537e 100644
--- a/offapi/com/sun/star/resource/StringResource.idl
+++ b/offapi/com/sun/star/resource/StringResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_resource_StringResourceManager_idl__
#define __com_sun_star_resource_StringResourceManager_idl__
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
#include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index 3cdf3d7c8b76..550bcdbbff76 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_resource_StringResourceWithLocation_idl__
#define __com_sun_star_resource_StringResourceWithLocation_idl__
-#ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
#include <com/sun/star/resource/XStringResourceWithLocation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/StringResourceWithStorage.idl b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
index fae096a6f869..92b4a9bddbfe 100644
--- a/offapi/com/sun/star/resource/StringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_resource_StringResourceWithStorage_idl__
#define __com_sun_star_resource_StringResourceWithStorage_idl__
-#ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
#include <com/sun/star/resource/XStringResourceWithStorage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index 9ae947b1c474..8659e76295a0 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_resource_XLocale_idl__
#define __com_sun_star_resource_XLocale_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl
index 15ff639663c3..15936e0e5c0e 100644
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++ b/offapi/com/sun/star/resource/XResourceBundle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_resource_XResourceBundle_idl__
#define __com_sun_star_resource_XResourceBundle_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
index 4440dbfdbdb7..ff474650e8bc 100644
--- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl
+++ b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
#define __com_sun_star_resource_XResourceBundleLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_resource_XResourceBundle_idl__
#include <com/sun/star/resource/XResourceBundle.idl>
-#endif
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index 140c6e832a59..c05d92b8f03a 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_resource_XStringResourceManager_idl__
#define __com_sun_star_resource_XStringResourceManager_idl__
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
#include <com/sun/star/resource/XStringResourceResolver.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index bb5c4a10b2a0..dc110398d388 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
#define __com_sun_star_resource_XStringResourcePersistence_idl__
-#ifndef __com_sun_star_resource_XStringResourceManager_idl__
#include <com/sun/star/resource/XStringResourceManager.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 5c6747e6ea3d..59153a3fac58 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
#define __com_sun_star_resource_XStringResourceResolver_idl__
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceSupplier.idl b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
index 1c56010b8ca2..b1e5231e9ca9 100644
--- a/offapi/com/sun/star/resource/XStringResourceSupplier.idl
+++ b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_resource_XStringResourceSupplier_idl__
#define __com_sun_star_resource_XStringResourceSupplier_idl__
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
#include <com/sun/star/resource/XStringResourceResolver.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index a537c57234ac..b493dc92cf9a 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
#define __com_sun_star_resource_XStringResourceWithLocation_idl__
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
#include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
index c251172eb344..b4dffbb9ccdf 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
#define __com_sun_star_resource_XStringResourceWithStorage_idl__
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
#include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/scanner/ScannerException.idl b/offapi/com/sun/star/scanner/ScannerException.idl
index a3b78111ca8d..ae0f0fb948b1 100644
--- a/offapi/com/sun/star/scanner/ScannerException.idl
+++ b/offapi/com/sun/star/scanner/ScannerException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_scanner_ScannerException_idl__
#define __com_sun_star_scanner_ScannerException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
#include <com/sun/star/scanner/ScanError.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index 950b0c8dcb0d..ad06759c89a0 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_scanner_ScannerManager_idl__
#define __com_sun_star_scanner_ScannerManager_idl__
-#ifndef __com_sun_star_scanner_XScannerManager_idl__
#include <com/sun/star/scanner/XScannerManager.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl
index 030dc66a7fbc..71da4ede2ff7 100644
--- a/offapi/com/sun/star/scanner/XScannerManager.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_scanner_XScannerManager_idl__
#define __com_sun_star_scanner_XScannerManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerContext_idl__
#include <com/sun/star/scanner/ScannerContext.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerException_idl__
#include <com/sun/star/scanner/ScannerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
#include <com/sun/star/scanner/ScanError.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
index 7dcb64bbdc0c..e05ae01e447b 100644
--- a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_DocumentDialogLibraryContainer_idl__
#define __com_sun_star_script_DocumentDialogLibraryContainer_idl__
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
#include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
#include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
index 4bb6838af681..0afbde900f97 100644
--- a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_DocumentScriptLibraryContainer_idl__
#define __com_sun_star_script_DocumentScriptLibraryContainer_idl__
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
#include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
#include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/LibraryNotLoadedException.idl b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
index 8a825fe7ce09..92c60516615a 100644
--- a/offapi/com/sun/star/script/LibraryNotLoadedException.idl
+++ b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_LibraryNotLoadedException_idl__
#define __com_sun_star_script_LibraryNotLoadedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
index b5c3e58eba2e..eda04ea91f91 100644
--- a/offapi/com/sun/star/script/ModuleInfo.idl
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -30,9 +30,7 @@
#ifndef __com_sun_star_script_ModuleInfo_idl__
#define __com_sun_star_script_ModuleInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module script {
diff --git a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
index e7bd9f67dc94..c66f60ac2747 100644
--- a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
+++ b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_document_ModuleSizeExceededRequest_idl__
#define __com_sun_star_document_ModuleSizeExceededRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainer.idl b/offapi/com/sun/star/script/XLibraryContainer.idl
index 3974aaa436da..92761e1fa84a 100644
--- a/offapi/com/sun/star/script/XLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer.idl
@@ -27,36 +27,20 @@
#ifndef __com_sun_star_script_XLibraryContainer_idl__
#define __com_sun_star_script_XLibraryContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainer2.idl b/offapi/com/sun/star/script/XLibraryContainer2.idl
index 2d315ca3a88f..b8918086f4ed 100644
--- a/offapi/com/sun/star/script/XLibraryContainer2.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XLibraryContainer2_idl__
#define __com_sun_star_script_XLibraryContainer2_idl__
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
#include <com/sun/star/script/XLibraryContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index 1045fc7a295c..602fcd648053 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XLibraryContainer3_idl__
#define __com_sun_star_script_XLibraryContainer3_idl__
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
#include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainerExport.idl b/offapi/com/sun/star/script/XLibraryContainerExport.idl
index cdaa975f8d5e..1dfe24345373 100644
--- a/offapi/com/sun/star/script/XLibraryContainerExport.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerExport.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_script_XLibraryContainerExport_idl__
#define __com_sun_star_script_XLibraryContainerExport_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainerPassword.idl b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
index 26cb1d211993..76a1f2223886 100644
--- a/offapi/com/sun/star/script/XLibraryContainerPassword.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_script_XLibraryContainerPassword_idl__
#define __com_sun_star_script_XLibraryContainerPassword_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index 1195c02fc93d..4fee0054e2a4 100644
--- a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__
#define __com_sun_star_script_XLibraryQueryExecutable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
index 200bd1d164ca..c4642b8d9b1f 100644
--- a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
#define __com_sun_star_script_XPersistentLibraryContainer_idl__
-#ifndef __com_sun_star_util_XModifiable_idl__
#include <com/sun/star/util/XModifiable.idl>
-#endif
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
#include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
index dce8259b6257..f5a1460ee681 100644
--- a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
@@ -29,12 +29,8 @@
#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
#define __com_sun_star_script_XStorageBasedLibraryContainer_idl__
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
-#ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
#include <com/sun/star/script/XPersistentLibraryContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/script/browse/BrowseNode.idl b/offapi/com/sun/star/script/browse/BrowseNode.idl
index 502f16f5799a..a834469dc58b 100644
--- a/offapi/com/sun/star/script/browse/BrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNode.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_script_browse_BrowseNode_idl__
#define __com_sun_star_script_browse_BrowseNode_idl__
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
#include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
module com {
module sun {
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
index 92897a44080a..0c57cabafa7d 100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_browse_BrowseNodeFactory_idl__
#define __com_sun_star_script_browse_BrowseNodeFactory_idl__
-#ifndef __com_sun_star_script_browse_XBrowseNodeFactory_idl__
#include <com/sun/star/script/browse/XBrowseNodeFactory.idl>
-#endif
module com { module sun { module star { module script { module browse {
diff --git a/offapi/com/sun/star/script/browse/XBrowseNode.idl b/offapi/com/sun/star/script/browse/XBrowseNode.idl
index bfa6c2eccecf..ecb6f989d4c5 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNode.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
#define __com_sun_star_script_browse_XBrowseNode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module script { module browse {
//==============================================================================
diff --git a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
index 46c041e6eaf9..2f724aa9af5a 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_provider_XBrowseNodeFactory_idl__
#define __com_sun_star_script_provider_XBrowseNodeFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
#include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_browse_BrowseNodeFactoryViewTypes_idl__
#include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
index 8072416c62f1..1430d3639bd6 100644
--- a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
#define __com_sun_star_script_provider_LanguageScriptProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
#include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
index 7a2bb02a194c..be69bd16aed6 100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_MasterScriptProvider_idl__
#define __com_sun_star_script_provider_MasterScriptProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
#include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
index bbc5f74ff011..b3a6e40424c7 100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_script_provider_MasterScriptProviderFactory_idl__
-#ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
#include <com/sun/star/script/provider/XScriptProviderFactory.idl>
-#endif
module com { module sun { module star { module script { module provider {
diff --git a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
index 72a7dc9e16c9..beca40a2ec82 100644
--- a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
#define __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
index db1eb21d0d79..9eb081b6f3d9 100644
--- a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
#define __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
-#ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
#include <com/sun/star/script/provider/ScriptErrorRaisedException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
index fbecc8974191..0e09d133ef82 100644
--- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
#define __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptProvider.idl b/offapi/com/sun/star/script/provider/ScriptProvider.idl
index a133301e392a..64fe6c32db64 100644
--- a/offapi/com/sun/star/script/provider/ScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProvider.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
#define __com_sun_star_script_provider_ScriptProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
#include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-
-#ifndef __com_sun_star_script_browse_BrowseNode_idl__
#include <com/sun/star/script/browse/BrowseNode.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
index 97541eb0e863..0c18072b53fe 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_ScriptProviderForBasic_idl__
#define __com_sun_star_script_provider_ScriptProviderForBasic_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
#include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
index e9c2d7dd8241..205d12b9305b 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
#define __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
#include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
index 6d171c305dac..8b61cd29e79a 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_ScriptProviderForJava_idl__
#define __com_sun_star_script_provider_ScriptProviderForJava_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
#include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
index e64067084beb..6748c7deb862 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
#define __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
#include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
index 111a65cb4a26..82a29d762094 100644
--- a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_script_provider_ScriptURIHelper_idl__
#define __com_sun_star_script_provider_ScriptURIHelper_idl__
-#ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
#include <com/sun/star/script/provider/XScriptURIHelper.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScript.idl b/offapi/com/sun/star/script/provider/XScript.idl
index 63656b73e3b1..eca2a38766c3 100644
--- a/offapi/com/sun/star/script/provider/XScript.idl
+++ b/offapi/com/sun/star/script/provider/XScript.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_script_provider_XScript_idl__
#define __com_sun_star_script_provider_XScript_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotConvertException_idl__
#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
#include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScriptContext.idl b/offapi/com/sun/star/script/provider/XScriptContext.idl
index f673b18716d7..ca4858d15202 100644
--- a/offapi/com/sun/star/script/provider/XScriptContext.idl
+++ b/offapi/com/sun/star/script/provider/XScriptContext.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_script_provider_XScriptContext_idl__
#define __com_sun_star_script_provider_XScriptContext_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
#include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
#include <com/sun/star/uno/XComponentContext.idl>
-#endif
module com { module sun { module star { module document {
diff --git a/offapi/com/sun/star/script/provider/XScriptProvider.idl b/offapi/com/sun/star/script/provider/XScriptProvider.idl
index 2d8d8171808b..2a397fc8b7d0 100644
--- a/offapi/com/sun/star/script/provider/XScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProvider.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
#define __com_sun_star_script_provider_XScriptProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScript_idl__
#include <com/sun/star/script/provider/XScript.idl>
-#endif
-#ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
#include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
index 42929b511a50..f7b6a801712c 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
#define __com_sun_star_script_provider_XScriptProviderFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
#include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
index 6fa088c85a32..5ff92cc23f8a 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
#define __com_sun_star_script_provider_XScriptProviderSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
#include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
index 1790df0a4a08..09e98959a5e6 100644
--- a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
#define __com_sun_star_script_provider_XScriptURIHelper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//===========================================================================
diff --git a/offapi/com/sun/star/sdb/CallableStatement.idl b/offapi/com/sun/star/sdb/CallableStatement.idl
index 151ada30313f..46866d530090 100644
--- a/offapi/com/sun/star/sdb/CallableStatement.idl
+++ b/offapi/com/sun/star/sdb/CallableStatement.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_CallableStatement_idl__
#define __com_sun_star_sdb_CallableStatement_idl__
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__
#include <com/sun/star/sdbc/CallableStatement.idl>
-#endif
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__
#include <com/sun/star/sdb/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Column.idl b/offapi/com/sun/star/sdb/Column.idl
index 982dfccbab49..ef9c79b4878b 100644
--- a/offapi/com/sun/star/sdb/Column.idl
+++ b/offapi/com/sun/star/sdb/Column.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_Column_idl__
#define __com_sun_star_sdb_Column_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
index c28c615b2284..560990a386e9 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__
#define __com_sun_star_sdb_ColumnDescriptorControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
index a1ba82c14b55..7e55bf0913a3 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
#define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ColumnSettings.idl b/offapi/com/sun/star/sdb/ColumnSettings.idl
index dd76640a7803..0fff088b1aa3 100644
--- a/offapi/com/sun/star/sdb/ColumnSettings.idl
+++ b/offapi/com/sun/star/sdb/ColumnSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#define __com_sun_star_sdb_ColumnSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Connection.idl b/offapi/com/sun/star/sdb/Connection.idl
index 66edbbf01b9d..29b7deeb4746 100644
--- a/offapi/com/sun/star/sdb/Connection.idl
+++ b/offapi/com/sun/star/sdb/Connection.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_Connection_idl__
#define __com_sun_star_sdb_Connection_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
module com { module sun { module star { module lang {
published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/sdb/ContentLoader.idl b/offapi/com/sun/star/sdb/ContentLoader.idl
index 8012afdf67d1..8dbcd1df6283 100644
--- a/offapi/com/sun/star/sdb/ContentLoader.idl
+++ b/offapi/com/sun/star/sdb/ContentLoader.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_sdb_ContentLoader_idl__
#define __com_sun_star_sdb_ContentLoader_idl__
-#ifndef __com_sun_star_frame_Frame_idl__
#include <com/sun/star/frame/FrameLoader.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index 91cc142f06de..3e3039777520 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
#define __com_sun_star_sdb_DataAccessDescriptor_idl__
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataColumn.idl b/offapi/com/sun/star/sdb/DataColumn.idl
index 8e5bc34924a1..15698d6886c5 100644
--- a/offapi/com/sun/star/sdb/DataColumn.idl
+++ b/offapi/com/sun/star/sdb/DataColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_DataColumn_idl__
#define __com_sun_star_sdb_DataColumn_idl__
-#ifndef __com_sun_star_sdb_ResultColumn_idl__
#include <com/sun/star/sdb/ResultColumn.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataSettings.idl b/offapi/com/sun/star/sdb/DataSettings.idl
index 326d5723cad3..d4cfd8a64c33 100644
--- a/offapi/com/sun/star/sdb/DataSettings.idl
+++ b/offapi/com/sun/star/sdb/DataSettings.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_sdb_DataSettings_idl__
#define __com_sun_star_sdb_DataSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.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
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index af2ded3582fb..9c78b742c9fa 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_DataSource_idl__
#define __com_sun_star_sdb_DataSource_idl__
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index c2bf52b04c7d..6785421cd0c6 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -29,21 +29,11 @@
#ifndef __com_sun_star_sdb_DataSourceBrowser_idl__
#define __com_sun_star_sdb_DataSourceBrowser_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
#include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccess.idl b/offapi/com/sun/star/sdb/DatabaseAccess.idl
index 8eb187384f35..06882bec93b0 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_DatabaseAccess_idl__
#define __com_sun_star_sdb_DatabaseAccess_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
index 4eb54d7db00a..a1be8caccef1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__
#define __com_sun_star_sdb_DatabaseAccessConnection_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
index 34922be1cdec..11763f6e3d78 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__
#define __com_sun_star_sdb_DatabaseAccessContext_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__
#include <com/sun/star/util/XLocalizedAliases.idl>
-#endif
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
index ff81048b834b..e23c97b3ece1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sdb_DatabaseAccessDataSource_idl__
#define __com_sun_star_sdb_DatabaseAccessDataSource_idl__
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
#include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index ac990e02c709..6d8d081d1cd9 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_DatabaseContext_idl__
#define __com_sun_star_sdb_DatabaseContext_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_uno_XNamingService_idl__
#include <com/sun/star/uno/XNamingService.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 6690c2929de4..96ca66877ff3 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_DatabaseDocument_idl__
#define __com_sun_star_sdb_DatabaseDocument_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
diff --git a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
index 72af2c84e7e8..5a26ca1394ed 100644
--- a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__
#define __com_sun_star_sdb_DatabaseEnvironment_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 79d5b31e6cbf..070d0aaa005d 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
#define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index c442929d4572..156a5a27ba29 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_DocumentDefinition_idl__
#define __com_sun_star_sdb_DocumentDefinition_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl
index 31a7128022c7..6013d4ade741 100644
--- a/offapi/com/sun/star/sdb/DocumentContainer.idl
+++ b/offapi/com/sun/star/sdb/DocumentContainer.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#define __com_sun_star_sdb_DocumentContainer_idl__
-#ifndef __com_sun_star_sdb_DefinitionContainer_idl__
#include <com/sun/star/sdb/DefinitionContainer.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
#include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
module com { module sun { module star { module lang {
diff --git a/offapi/com/sun/star/sdb/DocumentDataSource.idl b/offapi/com/sun/star/sdb/DocumentDataSource.idl
index 818d7645b2a0..79be69f078d5 100644
--- a/offapi/com/sun/star/sdb/DocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/DocumentDataSource.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_sdb_DocumentDataSource_idl__
#define __com_sun_star_sdb_DocumentDataSource_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
#include <com/sun/star/sdb/XDocumentDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSource_idl__
#include <com/sun/star/sdb/DataSource.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index 8ec36f9ec225..0a1d9e22dc78 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentDefinition2_idl__
#define __com_sun_star_sdb_DocumentDefinition2_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
#include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index a2a579fc47ac..48e4531692c4 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__
#define __com_sun_star_sdb_DocumentSaveRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 8c718103ef78..bb25adf93691 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__
#define __com_sun_star_sdb_ErrorMessageDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/Forms.idl b/offapi/com/sun/star/sdb/Forms.idl
index 42d2f0dd3330..d72f88f87617 100644
--- a/offapi/com/sun/star/sdb/Forms.idl
+++ b/offapi/com/sun/star/sdb/Forms.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Forms_idl__
#define __com_sun_star_sdb_Forms_idl__
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index b01809802b2c..72e066ed4ba2 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__
#define __com_sun_star_sdb_OfficeDatabaseDocument_idl__
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
#include <com/sun/star/document/XDocumentEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
#include <com/sun/star/script/provider/XScriptProviderSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
#include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/OrderColumn.idl b/offapi/com/sun/star/sdb/OrderColumn.idl
index baaaa4ae1416..420d685a8e20 100644
--- a/offapi/com/sun/star/sdb/OrderColumn.idl
+++ b/offapi/com/sun/star/sdb/OrderColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_OrderColumn_idl__
#define __com_sun_star_sdb_OrderColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ParametersRequest.idl b/offapi/com/sun/star/sdb/ParametersRequest.idl
index 547c49e7fd4b..f4e7c6a65a33 100644
--- a/offapi/com/sun/star/sdb/ParametersRequest.idl
+++ b/offapi/com/sun/star/sdb/ParametersRequest.idl
@@ -27,16 +27,10 @@
#ifndef __com_sun_star_sdb_ParametersRequest_idl__
#define __com_sun_star_sdb_ParametersRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/PreparedStatement.idl b/offapi/com/sun/star/sdb/PreparedStatement.idl
index 1ff4883e12df..06af4ef11f83 100644
--- a/offapi/com/sun/star/sdb/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdb/PreparedStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_PreparedStatement_idl__
#define __com_sun_star_sdb_PreparedStatement_idl__
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/Query.idl b/offapi/com/sun/star/sdb/Query.idl
index d5fbe5e3579c..c0f4da4e5e19 100644
--- a/offapi/com/sun/star/sdb/Query.idl
+++ b/offapi/com/sun/star/sdb/Query.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Query_idl__
#define __com_sun_star_sdb_Query_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
@@ -37,13 +35,9 @@
published interface XRename;
};};};};
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__
#include <com/sun/star/sdb/QueryDefinition.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 8c995a64aba2..f5091787ca99 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_QueryDefinition_idl__
#define __com_sun_star_sdb_QueryDefinition_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDescriptor.idl b/offapi/com/sun/star/sdb/QueryDescriptor.idl
index 89845599c309..4e1410a43632 100644
--- a/offapi/com/sun/star/sdb/QueryDescriptor.idl
+++ b/offapi/com/sun/star/sdb/QueryDescriptor.idl
@@ -27,18 +27,14 @@
#ifndef __com_sun_star_sdb_QueryDescriptor_idl__
#define __com_sun_star_sdb_QueryDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
published interface XColumnsSupplier;
};};};};
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index dbd74d416578..548875299182 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_QueryDesign_idl__
#define __com_sun_star_sdb_QueryDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 7b69a335ae31..218c400840c5 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_RelationDesign_idl__
#define __com_sun_star_sdb_RelationDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Reports.idl b/offapi/com/sun/star/sdb/Reports.idl
index 0951768c231b..41c927d12de9 100644
--- a/offapi/com/sun/star/sdb/Reports.idl
+++ b/offapi/com/sun/star/sdb/Reports.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Reports_idl__
#define __com_sun_star_sdb_Reports_idl__
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
diff --git a/offapi/com/sun/star/sdb/ResultColumn.idl b/offapi/com/sun/star/sdb/ResultColumn.idl
index 1ba3d261bc6c..ad83cb435842 100644
--- a/offapi/com/sun/star/sdb/ResultColumn.idl
+++ b/offapi/com/sun/star/sdb/ResultColumn.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_ResultColumn_idl__
#define __com_sun_star_sdb_ResultColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ResultSet.idl b/offapi/com/sun/star/sdb/ResultSet.idl
index 2ca4e304ebcf..0cfb3ae18f81 100644
--- a/offapi/com/sun/star/sdb/ResultSet.idl
+++ b/offapi/com/sun/star/sdb/ResultSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ResultSet_idl__
#define __com_sun_star_sdb_ResultSet_idl__
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__
#include <com/sun/star/sdbcx/ResultSet.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/RowChangeEvent.idl b/offapi/com/sun/star/sdb/RowChangeEvent.idl
index a04eb97e0003..42881aba69c5 100644
--- a/offapi/com/sun/star/sdb/RowChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#define __com_sun_star_sdb_RowChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index 3cbf7706b217..3c5d1567ffdd 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_RowSet_idl__
#define __com_sun_star_sdb_RowSet_idl__
-#ifndef __com_sun_star_sdbc_RowSet_idl__
#include <com/sun/star/sdbc/RowSet.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
};};};};
-
-#ifndef __com_sun_star_sdb_ResultSet_idl__
#include <com/sun/star/sdb/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDeleteRows;
diff --git a/offapi/com/sun/star/sdb/RowSetVetoException.idl b/offapi/com/sun/star/sdb/RowSetVetoException.idl
index 72f959ee8ca4..8e199ae83565 100644
--- a/offapi/com/sun/star/sdb/RowSetVetoException.idl
+++ b/offapi/com/sun/star/sdb/RowSetVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_RowSetVetoException_idl__
#define __com_sun_star_sdb_RowSetVetoException_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl
index d386a5552f9e..c5f7f94873cf 100644
--- a/offapi/com/sun/star/sdb/SQLContext.idl
+++ b/offapi/com/sun/star/sdb/SQLContext.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLContext_idl__
#define __com_sun_star_sdb_SQLContext_idl__
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLErrorEvent.idl b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
index 2be91d65a3dd..1037506879a1 100644
--- a/offapi/com/sun/star/sdb/SQLErrorEvent.idl
+++ b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
#define __com_sun_star_sdb_SQLErrorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLQueryComposer.idl b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
index 440011d8611a..cf030cb02a19 100644
--- a/offapi/com/sun/star/sdb/SQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLQueryComposer_idl__
#define __com_sun_star_sdb_SQLQueryComposer_idl__
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
index 160e537c3e89..85584a9543a0 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
#define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
module com { module sun { module star { module sdbcx {
interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
index 2d8ebcd93b4c..08f203e222cf 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__
#define __com_sun_star_sdb_SingleSelectQueryComposer_idl__
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Table.idl b/offapi/com/sun/star/sdb/Table.idl
index edc179f45e27..9b0c78a6159c 100644
--- a/offapi/com/sun/star/sdb/Table.idl
+++ b/offapi/com/sun/star/sdb/Table.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_Table_idl__
#define __com_sun_star_sdb_Table_idl__
-#ifndef __com_sun_star_sdbcx_Table_idl__
#include <com/sun/star/sdbcx/Table.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/TableDescriptor.idl b/offapi/com/sun/star/sdb/TableDescriptor.idl
index 99fc7a056e36..4a03a9bb4102 100644
--- a/offapi/com/sun/star/sdb/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdb/TableDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_TableDescriptor_idl__
#define __com_sun_star_sdb_TableDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
#include <com/sun/star/sdbcx/TableDescriptor.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index a9ca8702f00b..814895e4bcbf 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_TableDesign_idl__
#define __com_sun_star_sdb_TableDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XAlterQuery.idl b/offapi/com/sun/star/sdb/XAlterQuery.idl
index 39d328d68074..83008f5450ee 100644
--- a/offapi/com/sun/star/sdb/XAlterQuery.idl
+++ b/offapi/com/sun/star/sdb/XAlterQuery.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XAlterQuery_idl__
#define __com_sun_star_sdb_XAlterQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
index fdb0e8adc7e0..e7f8a9875338 100644
--- a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__
#define __com_sun_star_sdb_XBookmarksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XColumn.idl b/offapi/com/sun/star/sdb/XColumn.idl
index 7cb25c0e78dd..94ce6d7f453c 100644
--- a/offapi/com/sun/star/sdb/XColumn.idl
+++ b/offapi/com/sun/star/sdb/XColumn.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_XColumn_idl__
#define __com_sun_star_sdb_XColumn_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XColumnUpdate.idl b/offapi/com/sun/star/sdb/XColumnUpdate.idl
index cecad2439698..eecc71f034c6 100644
--- a/offapi/com/sun/star/sdb/XColumnUpdate.idl
+++ b/offapi/com/sun/star/sdb/XColumnUpdate.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_XColumnUpdate_idl__
#define __com_sun_star_sdb_XColumnUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XCommandPreparation.idl b/offapi/com/sun/star/sdb/XCommandPreparation.idl
index 25bed38357cd..d49a14278b9c 100644
--- a/offapi/com/sun/star/sdb/XCommandPreparation.idl
+++ b/offapi/com/sun/star/sdb/XCommandPreparation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XCommandPreparation_idl__
#define __com_sun_star_sdb_XCommandPreparation_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XPreparedStatement;
diff --git a/offapi/com/sun/star/sdb/XCompletedConnection.idl b/offapi/com/sun/star/sdb/XCompletedConnection.idl
index c40a4069c092..02d797dcb15f 100644
--- a/offapi/com/sun/star/sdb/XCompletedConnection.idl
+++ b/offapi/com/sun/star/sdb/XCompletedConnection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XCompletedConnection_idl__
#define __com_sun_star_sdb_XCompletedConnection_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
diff --git a/offapi/com/sun/star/sdb/XCompletedExecution.idl b/offapi/com/sun/star/sdb/XCompletedExecution.idl
index 395598e1e70e..eb6002299cdf 100644
--- a/offapi/com/sun/star/sdb/XCompletedExecution.idl
+++ b/offapi/com/sun/star/sdb/XCompletedExecution.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#define __com_sun_star_sdb_XCompletedExecution_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
index 76680df46bec..ca0966f225be 100644
--- a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
#define __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccess.idl b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
index 9339d3efcac1..d22db49f3baa 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_XDatabaseAccess_idl__
#define __com_sun_star_sdb_XDatabaseAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module task {
published interface XInteractionHandler;
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
index 6826d9354a29..c153acb7b9f4 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__
#define __com_sun_star_sdb_XDatabaseAccessListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
index bf244d52c0ba..f32d0108812a 100644
--- a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__
#define __com_sun_star_sdb_XDatabaseEnvironment_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__
#include <com/sun/star/sdbc/XDriverManager.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index b0e891b0a084..5f6148c11355 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
#define __com_sun_star_sdb_XDocumentDataSource_idl__
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index 672505bc12ad..c3e125fdc940 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index 4d89d66a6ca4..f9d9691dede3 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__
#define __com_sun_star_sdb_XInteractionDocumentSave_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
index 56bed78ff8fe..6554452f63b6 100644
--- a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
+++ b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__
#define __com_sun_star_sdb_XInteractionSupplyParameters_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index b2640704537c..ef7cdee0f173 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
#include <com/sun/star/sdb/XFormDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
#include <com/sun/star/sdb/XReportDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
#include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XParametersSupplier.idl b/offapi/com/sun/star/sdb/XParametersSupplier.idl
index c5179eb02d7e..564396312e57 100644
--- a/offapi/com/sun/star/sdb/XParametersSupplier.idl
+++ b/offapi/com/sun/star/sdb/XParametersSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XParametersSupplier_idl__
#define __com_sun_star_sdb_XParametersSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XQueriesSupplier.idl b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
index a447b8fa598c..e191fcf41b80 100644
--- a/offapi/com/sun/star/sdb/XQueriesSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XQueriesSupplier_idl__
#define __com_sun_star_sdb_XQueriesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
index e56d2fbafa56..4588e1c8835e 100644
--- a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
#define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index d7b15fbc0018..db17d331f03b 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XResultSetAccess.idl b/offapi/com/sun/star/sdb/XResultSetAccess.idl
index a0c388e9374a..1aefdc9b821f 100644
--- a/offapi/com/sun/star/sdb/XResultSetAccess.idl
+++ b/offapi/com/sun/star/sdb/XResultSetAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XResultSetAccess_idl__
#define __com_sun_star_sdb_XResultSetAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 68f5e66535ac..fb1d49b2c763 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
#define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index c2388024e1e5..095b04af83ca 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__
#define __com_sun_star_sdb_XRowSetApproveListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index 7c7e2ab9ec42..45fa3c662cac 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XRowSetSupplier_idl__
#define __com_sun_star_sdb_XRowSetSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowsChangeListener.idl b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
index a3cfca899a20..6c7d65f46fa3 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XRowsChangeListener_idl__
#define __com_sun_star_sdb_XRowsChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
#include <com/sun/star/sdb/RowsChangeEvent.idl>
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
index 8b5d67c1e884..002d553033c7 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
#define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
#include <com/sun/star/sdb/XSQLErrorListener.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 6f7497fa7110..ec94ab656d58 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
#define __com_sun_star_sdb_XSQLErrorListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
#include <com/sun/star/sdb/SQLErrorEvent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index e9c5756db7d7..0ba2746afa55 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#define __com_sun_star_sdb_XSQLQueryComposer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 1382966f264c..157ad0b1a7d2 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
#define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 8c377e2f0693..84f1ba95d7c3 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#define __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module container {
interface XIndexAccess;
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 2bd5270adee8..ba7f716c58c5 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
index 9a9fc8761d02..75b6a6270199 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
#define __com_sun_star_sdb_application_CopyTableRowEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index f294c9f69d2c..c4c31ec4ae23 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_sdb_application_CopyTableWizard_idl__
#define __com_sun_star_sdb_application_CopyTableWizard_idl__
-#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
#include <com/sun/star/sdb/application/XCopyTableWizard.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 46f9f95a7500..762dc7ecdc88 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_application_DatabaseObject_idl__
#define __com_sun_star_sdb_application_DatabaseObject_idl__
-#ifndef __com_sun_star_sdb_CommandType_idl__
#include <com/sun/star/sdb/CommandType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
index d53f399b281c..ef64f3f71537 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_application_XCopyTableListener_idl__
#define __com_sun_star_sdb_application_XCopyTableListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
#include <com/sun/star/sdb/application/CopyTableRowEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index 9db2b0d5301f..8fd404489f07 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
#define __com_sun_star_sdb_application_XCopyTableWizard_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index 413ce17d0901..e581792227c0 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -29,12 +29,8 @@
#define __com_sun_star_sdb_tools_XConnectionSupplier_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index fadfe541a165..9f74750c630b 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_tools_XConnectionTools_idl__
#define __com_sun_star_sdb_tools_XConnectionTools_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star {
module container {
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index b2b00c758250..2ffb3caabb0a 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
#define __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index 784612363f44..bc6ebc4f146e 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XIndexAlteration_idl__
#define __com_sun_star_sdb_tools_XIndexAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 19f8347afc42..f2a00d23c58f 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XKeyAlteration_idl__
#define __com_sun_star_sdb_tools_XKeyAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index e636631339af..6f55eda0d20a 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sdb_tools_XObjectNames_idl__
#define __com_sun_star_sdb_tools_XObjectNames_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index 726632277892..9fed4c25d635 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XTableAlteration_idl__
#define __com_sun_star_sdb_tools_XTableAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 3e776214985e..4f80998bd4f3 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sdb_tools_XTableName_idl__
#define __com_sun_star_sdb_tools_XTableName_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index a1b9ee37eabf..50bcb4c52beb 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XTableRename_idl__
#define __com_sun_star_sdb_tools_XTableRename_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index 731b906f6ba2..41f8c39c57c7 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XViewAccess_idl__
#define __com_sun_star_sdb_tools_XViewAccess_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdbc/BatchUpdateException.idl b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
index b3ef24879004..8baa053a84c4 100644
--- a/offapi/com/sun/star/sdbc/BatchUpdateException.idl
+++ b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_BatchUpdateException_idl__
#define __com_sun_star_sdbc_BatchUpdateException_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/CallableStatement.idl b/offapi/com/sun/star/sdbc/CallableStatement.idl
index c0e8a49c1144..a52fe89c870e 100644
--- a/offapi/com/sun/star/sdbc/CallableStatement.idl
+++ b/offapi/com/sun/star/sdbc/CallableStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_CallableStatement_idl__
#define __com_sun_star_sdbc_CallableStatement_idl__
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/ChangeEvent.idl b/offapi/com/sun/star/sdbc/ChangeEvent.idl
index 563d722bc3ee..db970cd7c2e4 100644
--- a/offapi/com/sun/star/sdbc/ChangeEvent.idl
+++ b/offapi/com/sun/star/sdbc/ChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_ChangeEvent_idl__
#define __com_sun_star_sdbc_ChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/Connection.idl b/offapi/com/sun/star/sdbc/Connection.idl
index d71e37e79f58..dcad58ef98a9 100644
--- a/offapi/com/sun/star/sdbc/Connection.idl
+++ b/offapi/com/sun/star/sdbc/Connection.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_Connection_idl__
#define __com_sun_star_sdbc_Connection_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
index 36eb770360d1..9eb7764fe8f4 100644
--- a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_DBASEConnectionProperties_idl__
#define __com_sun_star_sdbc_DBASEConnectionProperties_idl__
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
#include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/DataTruncation.idl b/offapi/com/sun/star/sdbc/DataTruncation.idl
index e200867014d0..d717762ef4e8 100644
--- a/offapi/com/sun/star/sdbc/DataTruncation.idl
+++ b/offapi/com/sun/star/sdbc/DataTruncation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_DataTruncation_idl__
#define __com_sun_star_sdbc_DataTruncation_idl__
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index 4324ea7da7d3..1107ee6775bf 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_DriverManager_idl__
#define __com_sun_star_sdbc_DriverManager_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
index ee6b10597739..9341524f20e9 100644
--- a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
#define __com_sun_star_sdbc_FILEConnectionProperties_idl__
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
index a611b216b1e5..8e36417bcfee 100644
--- a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_FLATConnectionProperties_idl__
#define __com_sun_star_sdbc_FLATConnectionProperties_idl__
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
#include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
index 5404c50272d2..01f8cd751ac1 100644
--- a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdbc_JDBCConnectionProperties_idl__
#define __com_sun_star_sdbc_JDBCConnectionProperties_idl__
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
index 54e1eb86361d..0ba6cce52057 100644
--- a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_ODBCConnectionProperties_idl__
#define __com_sun_star_sdbc_ODBCConnectionProperties_idl__
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index 83f520f70fd6..fbd2c0156816 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
#define __com_sun_star_sdbc_PreparedStatement_idl__
-#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_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index b5fd0a66c3f4..33e7ac9de49b 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbc_ResultSet_idl__
#define __com_sun_star_sdbc_ResultSet_idl__
-#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_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index b20fd3fe50d7..468f8b5124c3 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdbc_RowSet_idl__
#define __com_sun_star_sdbc_RowSet_idl__
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XColumnLocate_idl__
#include <com/sun/star/sdbc/XColumnLocate.idl>
-#endif
module com { module sun { module star { module container {
published interface XNameAccess;
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 11d66fb3fd57..d1b931f6baa6 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_SQLException_idl__
#define __com_sun_star_sdbc_SQLException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/SQLWarning.idl b/offapi/com/sun/star/sdbc/SQLWarning.idl
index 3be1a07cef87..c6d66fd7f781 100644
--- a/offapi/com/sun/star/sdbc/SQLWarning.idl
+++ b/offapi/com/sun/star/sdbc/SQLWarning.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_SQLWarning_idl__
#define __com_sun_star_sdbc_SQLWarning_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index 8acb7216cb94..06aeb47a9a96 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbc_Statement_idl__
#define __com_sun_star_sdbc_Statement_idl__
-#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_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XArray.idl b/offapi/com/sun/star/sdbc/XArray.idl
index c9cb8656370d..d35250c28ae1 100644
--- a/offapi/com/sun/star/sdbc/XArray.idl
+++ b/offapi/com/sun/star/sdbc/XArray.idl
@@ -27,17 +27,13 @@
#ifndef __com_sun_star_sdbc_XArray_idl__
#define __com_sun_star_sdbc_XArray_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module container {
published interface XNameAccess;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XBatchExecution.idl b/offapi/com/sun/star/sdbc/XBatchExecution.idl
index 6a81d58c1b5b..03bd0fe04dc6 100644
--- a/offapi/com/sun/star/sdbc/XBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XBatchExecution.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XBatchExecution_idl__
#define __com_sun_star_sdbc_XBatchExecution_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XBlob.idl b/offapi/com/sun/star/sdbc/XBlob.idl
index ef42045662b5..298db245ac49 100644
--- a/offapi/com/sun/star/sdbc/XBlob.idl
+++ b/offapi/com/sun/star/sdbc/XBlob.idl
@@ -27,17 +27,13 @@
#ifndef __com_sun_star_sdbc_XBlob_idl__
#define __com_sun_star_sdbc_XBlob_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XClob.idl b/offapi/com/sun/star/sdbc/XClob.idl
index 8eec6d9e1645..c68ffe960825 100644
--- a/offapi/com/sun/star/sdbc/XClob.idl
+++ b/offapi/com/sun/star/sdbc/XClob.idl
@@ -27,17 +27,13 @@
#ifndef __com_sun_star_sdbc_XClob_idl__
#define __com_sun_star_sdbc_XClob_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XCloseable.idl b/offapi/com/sun/star/sdbc/XCloseable.idl
index 13f92f238f82..20986e9b8bc2 100644
--- a/offapi/com/sun/star/sdbc/XCloseable.idl
+++ b/offapi/com/sun/star/sdbc/XCloseable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XCloseable_idl__
#define __com_sun_star_sdbc_XCloseable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XColumnLocate.idl b/offapi/com/sun/star/sdbc/XColumnLocate.idl
index ccab7a2c0cdf..216ff0873e06 100644
--- a/offapi/com/sun/star/sdbc/XColumnLocate.idl
+++ b/offapi/com/sun/star/sdbc/XColumnLocate.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XColumnLocate_idl__
#define __com_sun_star_sdbc_XColumnLocate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XConnection.idl b/offapi/com/sun/star/sdbc/XConnection.idl
index 4fbb0ac728ba..9702f6e74c6f 100644
--- a/offapi/com/sun/star/sdbc/XConnection.idl
+++ b/offapi/com/sun/star/sdbc/XConnection.idl
@@ -27,21 +27,15 @@
#ifndef __com_sun_star_sdbc_XConnection_idl__
#define __com_sun_star_sdbc_XConnection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module container {
published interface XNameAccess;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
#include <com/sun/star/sdbc/XCloseable.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XDataSource.idl b/offapi/com/sun/star/sdbc/XDataSource.idl
index 2c2f4f13323e..e68c7d61ca41 100644
--- a/offapi/com/sun/star/sdbc/XDataSource.idl
+++ b/offapi/com/sun/star/sdbc/XDataSource.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XDataSource_idl__
#define __com_sun_star_sdbc_XDataSource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 4e6c64f120ac..20dc8b379cfe 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
#define __com_sun_star_sdbc_XDatabaseMetaData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
index f6a5040d8415..c2ed6e31bfd1 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdbc_XDatabaseMetaData2_idl__
#define __com_sun_star_sdbc_XDatabaseMetaData2_idl__
-#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
#include <com/sun/star/sdbc/XDatabaseMetaData.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdbc/XDriver.idl b/offapi/com/sun/star/sdbc/XDriver.idl
index 623c232ceb2b..7329f15dbfa5 100644
--- a/offapi/com/sun/star/sdbc/XDriver.idl
+++ b/offapi/com/sun/star/sdbc/XDriver.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdbc_XDriver_idl__
#define __com_sun_star_sdbc_XDriver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__
#include <com/sun/star/sdbc/DriverPropertyInfo.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XDriverAccess.idl b/offapi/com/sun/star/sdbc/XDriverAccess.idl
index 112921f04e15..820860bbe1cd 100644
--- a/offapi/com/sun/star/sdbc/XDriverAccess.idl
+++ b/offapi/com/sun/star/sdbc/XDriverAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_XDriverAccess_idl__
#define __com_sun_star_sdbc_XDriverAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XDriverManager.idl b/offapi/com/sun/star/sdbc/XDriverManager.idl
index 896d8a59deea..176cd0120aef 100644
--- a/offapi/com/sun/star/sdbc/XDriverManager.idl
+++ b/offapi/com/sun/star/sdbc/XDriverManager.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbc_XDriverManager_idl__
#define __com_sun_star_sdbc_XDriverManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
index edc6e4ab7c81..a910d7ec66af 100644
--- a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XGeneratedResultSet_idl__
#define __com_sun_star_sdbc_XGeneratedResultSet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
index 5f34df8e84ce..bb06e9deaf85 100644
--- a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
+++ b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XIsolatedConnection_idl__
#define __com_sun_star_sdbc_XIsolatedConnection_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XMultipleResults.idl b/offapi/com/sun/star/sdbc/XMultipleResults.idl
index 9bda09c36145..21d7b08e1d10 100644
--- a/offapi/com/sun/star/sdbc/XMultipleResults.idl
+++ b/offapi/com/sun/star/sdbc/XMultipleResults.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XMultipleResults_idl__
#define __com_sun_star_sdbc_XMultipleResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XOutParameters.idl b/offapi/com/sun/star/sdbc/XOutParameters.idl
index a9047e958633..efe184de0bf6 100644
--- a/offapi/com/sun/star/sdbc/XOutParameters.idl
+++ b/offapi/com/sun/star/sdbc/XOutParameters.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XOutParameters_idl__
#define __com_sun_star_sdbc_XOutParameters_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XParameters.idl b/offapi/com/sun/star/sdbc/XParameters.idl
index 173e71789c5c..e768cfba526d 100644
--- a/offapi/com/sun/star/sdbc/XParameters.idl
+++ b/offapi/com/sun/star/sdbc/XParameters.idl
@@ -27,29 +27,19 @@
#ifndef __com_sun_star_sdbc_XParameters_idl__
#define __com_sun_star_sdbc_XParameters_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XPooledConnection.idl b/offapi/com/sun/star/sdbc/XPooledConnection.idl
index 5b7b2389676a..9b75ca3265be 100644
--- a/offapi/com/sun/star/sdbc/XPooledConnection.idl
+++ b/offapi/com/sun/star/sdbc/XPooledConnection.idl
@@ -28,17 +28,11 @@
#ifndef __com_sun_star_sdbc_XPooledConnection_idl__
#define __com_sun_star_sdbc_XPooledConnection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
index 7b610ce10f56..05bbd2ef9e64 100644
--- a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XPreparedBatchExecution_idl__
#define __com_sun_star_sdbc_XPreparedBatchExecution_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XPreparedStatement.idl b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
index 1fda543f3916..91663dceb6ac 100644
--- a/offapi/com/sun/star/sdbc/XPreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XPreparedStatement_idl__
#define __com_sun_star_sdbc_XPreparedStatement_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XRef.idl b/offapi/com/sun/star/sdbc/XRef.idl
index e14e30db6e3f..51724d4d8f92 100644
--- a/offapi/com/sun/star/sdbc/XRef.idl
+++ b/offapi/com/sun/star/sdbc/XRef.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XRef_idl__
#define __com_sun_star_sdbc_XRef_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XResultSet.idl b/offapi/com/sun/star/sdbc/XResultSet.idl
index 6751203b5cad..ab474c933f01 100644
--- a/offapi/com/sun/star/sdbc/XResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XResultSet.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XResultSet_idl__
#define __com_sun_star_sdbc_XResultSet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
index c0f7ff78364f..eb100fdcf065 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XResultSetMetaData_idl__
#define __com_sun_star_sdbc_XResultSetMetaData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
index 55af74460126..8bac6ea0c5d0 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
#define __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index c68774a23652..fed315c9d1a7 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
#define __com_sun_star_sdbc_XResultSetUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XRow.idl b/offapi/com/sun/star/sdbc/XRow.idl
index 72ab3fba1885..f367dba54c74 100644
--- a/offapi/com/sun/star/sdbc/XRow.idl
+++ b/offapi/com/sun/star/sdbc/XRow.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdbc_XRow_idl__
#define __com_sun_star_sdbc_XRow_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
@@ -51,9 +43,7 @@
published interface XNameAccess;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index ebdc0022f5ad..14ad392bebc8 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_XRowSet_idl__
#define __com_sun_star_sdbc_XRowSet_idl__
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index 948201e526e9..1af58f47b00d 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbc_XRowSetListener_idl__
#define __com_sun_star_sdbc_XRowSetListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XRowUpdate.idl b/offapi/com/sun/star/sdbc/XRowUpdate.idl
index e61286e11605..b28a6b4c7b1a 100644
--- a/offapi/com/sun/star/sdbc/XRowUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XRowUpdate.idl
@@ -27,29 +27,19 @@
#ifndef __com_sun_star_sdbc_XRowUpdate_idl__
#define __com_sun_star_sdbc_XRowUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XSQLData.idl b/offapi/com/sun/star/sdbc/XSQLData.idl
index f26a09e283fd..c7421b8dbd79 100644
--- a/offapi/com/sun/star/sdbc/XSQLData.idl
+++ b/offapi/com/sun/star/sdbc/XSQLData.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XSQLData_idl__
#define __com_sun_star_sdbc_XSQLData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XSQLInput.idl b/offapi/com/sun/star/sdbc/XSQLInput.idl
index 40636f8bbca1..02159d875586 100644
--- a/offapi/com/sun/star/sdbc/XSQLInput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLInput.idl
@@ -27,29 +27,19 @@
#ifndef __com_sun_star_sdbc_XSQLInput_idl__
#define __com_sun_star_sdbc_XSQLInput_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XSQLOutput.idl b/offapi/com/sun/star/sdbc/XSQLOutput.idl
index 9d08311929e7..9c329abcd96f 100644
--- a/offapi/com/sun/star/sdbc/XSQLOutput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLOutput.idl
@@ -27,29 +27,19 @@
#ifndef __com_sun_star_sdbc_XSQLOutput_idl__
#define __com_sun_star_sdbc_XSQLOutput_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XStatement.idl b/offapi/com/sun/star/sdbc/XStatement.idl
index c07288c00c85..3bd87f2782a3 100644
--- a/offapi/com/sun/star/sdbc/XStatement.idl
+++ b/offapi/com/sun/star/sdbc/XStatement.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XStatement_idl__
#define __com_sun_star_sdbc_XStatement_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XStruct.idl b/offapi/com/sun/star/sdbc/XStruct.idl
index a31535decf46..7a3cebb9222f 100644
--- a/offapi/com/sun/star/sdbc/XStruct.idl
+++ b/offapi/com/sun/star/sdbc/XStruct.idl
@@ -27,17 +27,13 @@
#ifndef __com_sun_star_sdbc_XStruct_idl__
#define __com_sun_star_sdbc_XStruct_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module container {
published interface XNameAccess;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
index c19f977a8273..3f59f3523c9e 100644
--- a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbc_XWarningsSupplier_idl__
#define __com_sun_star_sdbc_XWarningsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdbcx/Column.idl b/offapi/com/sun/star/sdbcx/Column.idl
index fd2fa91c6e3e..56a69e251127 100644
--- a/offapi/com/sun/star/sdbcx/Column.idl
+++ b/offapi/com/sun/star/sdbcx/Column.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Column_idl__
#define __com_sun_star_sdbcx_Column_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
index b5d832cb4d3a..73e97b78b765 100644
--- a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_ColumnDescriptor_idl__
#define __com_sun_star_sdbcx_ColumnDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Descriptor.idl b/offapi/com/sun/star/sdbcx/Descriptor.idl
index 27c709dd3bec..b990be127baa 100644
--- a/offapi/com/sun/star/sdbcx/Descriptor.idl
+++ b/offapi/com/sun/star/sdbcx/Descriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#define __com_sun_star_sdbcx_Descriptor_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Driver.idl b/offapi/com/sun/star/sdbcx/Driver.idl
index 0388a4f3e063..a7e0ac679ec7 100644
--- a/offapi/com/sun/star/sdbcx/Driver.idl
+++ b/offapi/com/sun/star/sdbcx/Driver.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Driver_idl__
#define __com_sun_star_sdbcx_Driver_idl__
-#ifndef __com_sun_star_sdbc_Driver_idl__
#include <com/sun/star/sdbc/Driver.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Group.idl b/offapi/com/sun/star/sdbcx/Group.idl
index 51e528d16837..208c8fd82781 100644
--- a/offapi/com/sun/star/sdbcx/Group.idl
+++ b/offapi/com/sun/star/sdbcx/Group.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Group_idl__
#define __com_sun_star_sdbcx_Group_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
index 1b5386db3e5f..8400f4fcae8f 100644
--- a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_GroupDescriptor_idl__
#define __com_sun_star_sdbcx_GroupDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
/** is used to create a new group in a database.
diff --git a/offapi/com/sun/star/sdbcx/Index.idl b/offapi/com/sun/star/sdbcx/Index.idl
index 3fab8da51b63..e628915e3f12 100644
--- a/offapi/com/sun/star/sdbcx/Index.idl
+++ b/offapi/com/sun/star/sdbcx/Index.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Index_idl__
#define __com_sun_star_sdbcx_Index_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/IndexColumn.idl b/offapi/com/sun/star/sdbcx/IndexColumn.idl
index 4aba576e4b38..dba84f6e0972 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumn.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_IndexColumn_idl__
#define __com_sun_star_sdbcx_IndexColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
index 7c8fb976b984..adf0df972ff5 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
#define __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
index 4d7564c54abc..312e804ca1ac 100644
--- a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_IndexDescriptor_idl__
#define __com_sun_star_sdbcx_IndexDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Key.idl b/offapi/com/sun/star/sdbcx/Key.idl
index f28a05933639..3d403edc1ad4 100644
--- a/offapi/com/sun/star/sdbcx/Key.idl
+++ b/offapi/com/sun/star/sdbcx/Key.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Key_idl__
#define __com_sun_star_sdbcx_Key_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/KeyColumn.idl b/offapi/com/sun/star/sdbcx/KeyColumn.idl
index f62c3f571206..b7dfda32af04 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumn.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_KeyColumn_idl__
#define __com_sun_star_sdbcx_KeyColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
index 4ae8ce69a27f..657a3c2190f0 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
#define __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
index 21386156af08..8a143416cac4 100644
--- a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_KeyDescriptor_idl__
#define __com_sun_star_sdbcx_KeyDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/PreparedStatement.idl b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
index a033e09fa3ed..0348dd12db0f 100644
--- a/offapi/com/sun/star/sdbcx/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_PreparedStatement_idl__
#define __com_sun_star_sdbcx_PreparedStatement_idl__
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
index 14bc4c75e344..5df52fa59063 100644
--- a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
+++ b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_ReferenceColumn_idl__
#define __com_sun_star_sdbcx_ReferenceColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/ResultSet.idl b/offapi/com/sun/star/sdbcx/ResultSet.idl
index 8304045556ac..8307cd9ed3f5 100644
--- a/offapi/com/sun/star/sdbcx/ResultSet.idl
+++ b/offapi/com/sun/star/sdbcx/ResultSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_ResultSet_idl__
#define __com_sun_star_sdbcx_ResultSet_idl__
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Statement.idl b/offapi/com/sun/star/sdbcx/Statement.idl
index 4c9a6e75e243..315eb6eac2b7 100644
--- a/offapi/com/sun/star/sdbcx/Statement.idl
+++ b/offapi/com/sun/star/sdbcx/Statement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Statement_idl__
#define __com_sun_star_sdbcx_Statement_idl__
-#ifndef __com_sun_star_sdbc_Statement_idl__
#include <com/sun/star/sdbc/Statement.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/Table.idl b/offapi/com/sun/star/sdbcx/Table.idl
index b5c0b25e34ca..0048bd158335 100644
--- a/offapi/com/sun/star/sdbcx/Table.idl
+++ b/offapi/com/sun/star/sdbcx/Table.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_Table_idl__
#define __com_sun_star_sdbcx_Table_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/TableDescriptor.idl b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
index 97a240065692..104c9ccf6d69 100644
--- a/offapi/com/sun/star/sdbcx/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
#define __com_sun_star_sdbcx_TableDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/User.idl b/offapi/com/sun/star/sdbcx/User.idl
index 6ffc5bfbe9a1..f54d4eac8940 100644
--- a/offapi/com/sun/star/sdbcx/User.idl
+++ b/offapi/com/sun/star/sdbcx/User.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_User_idl__
#define __com_sun_star_sdbcx_User_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/UserDescriptor.idl b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
index 4c9d7bbe3e55..678d2743a4d4 100644
--- a/offapi/com/sun/star/sdbcx/UserDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_UserDescriptor_idl__
#define __com_sun_star_sdbcx_UserDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/View.idl b/offapi/com/sun/star/sdbcx/View.idl
index b84fad819f92..96f6cc40d973 100644
--- a/offapi/com/sun/star/sdbcx/View.idl
+++ b/offapi/com/sun/star/sdbcx/View.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_View_idl__
#define __com_sun_star_sdbcx_View_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
index dd481c3891d3..41316496542f 100644
--- a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_ViewDescriptor_idl__
#define __com_sun_star_sdbcx_ViewDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XAlterTable.idl b/offapi/com/sun/star/sdbcx/XAlterTable.idl
index 63363b7b309f..2f2a53a17685 100644
--- a/offapi/com/sun/star/sdbcx/XAlterTable.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterTable.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_sdbcx_XAlterTable_idl__
#define __com_sun_star_sdbcx_XAlterTable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com { module sun { module star { module beans {
published interface XPropertySet;
};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XAlterView.idl b/offapi/com/sun/star/sdbcx/XAlterView.idl
index d234562b3914..d76c2538177a 100644
--- a/offapi/com/sun/star/sdbcx/XAlterView.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterView.idl
@@ -28,9 +28,7 @@
#ifndef __offapi_com_sun_star_sdbcx_XAlterView_idl__
#define __offapi_com_sun_star_sdbcx_XAlterView_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdbcx/XAppend.idl b/offapi/com/sun/star/sdbcx/XAppend.idl
index ed3ce7c483af..7dbf054efb91 100644
--- a/offapi/com/sun/star/sdbcx/XAppend.idl
+++ b/offapi/com/sun/star/sdbcx/XAppend.idl
@@ -27,21 +27,15 @@
#ifndef __com_sun_star_sdbcx_XAppend_idl__
#define __com_sun_star_sdbcx_XAppend_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
module com { module sun { module star { module beans {
published interface XPropertySet;
};};};};
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XAuthorizable.idl b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
index c83018643ed4..fde5e84c99f1 100644
--- a/offapi/com/sun/star/sdbcx/XAuthorizable.idl
+++ b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
#define __com_sun_star_sdbcx_XAuthorizable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
index bf8cf553edea..3aefa572892a 100644
--- a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbcx_XColumnsSupplier_idl__
#define __com_sun_star_sdbcx_XColumnsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
index 1aae744ebb2c..9aaf2b117112 100644
--- a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdbcx_XCreateCatalog_idl__
#define __com_sun_star_sdbcx_XCreateCatalog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
index 3a1ad1010d99..778372b192c6 100644
--- a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
#define __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
diff --git a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
index 9b4356a6366f..c11115f5af4e 100644
--- a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
#define __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module beans {
published interface XPropertySet;
diff --git a/offapi/com/sun/star/sdbcx/XDeleteRows.idl b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
index d2924e388e63..ea89327d9ce5 100644
--- a/offapi/com/sun/star/sdbcx/XDeleteRows.idl
+++ b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XDeleteRows_idl__
#define __com_sun_star_sdbcx_XDeleteRows_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XDrop.idl b/offapi/com/sun/star/sdbcx/XDrop.idl
index d7e7520852a9..948fe8cb8d35 100644
--- a/offapi/com/sun/star/sdbcx/XDrop.idl
+++ b/offapi/com/sun/star/sdbcx/XDrop.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdbcx_XDrop_idl__
#define __com_sun_star_sdbcx_XDrop_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XDropCatalog.idl b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
index 8091d914aa86..82e1d4251095 100644
--- a/offapi/com/sun/star/sdbcx/XDropCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdbcx_XDropCatalog_idl__
#define __com_sun_star_sdbcx_XDropCatalog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
index e2bbae67c8b3..28f8611e5c70 100644
--- a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XGroupsSupplier_idl__
#define __com_sun_star_sdbcx_XGroupsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
index 666d02104201..3bb6cfdd8604 100644
--- a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XIndexesSupplier_idl__
#define __com_sun_star_sdbcx_XIndexesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
index 1954bd2056d6..657dc0590138 100644
--- a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XKeysSupplier_idl__
#define __com_sun_star_sdbcx_XKeysSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XRename.idl b/offapi/com/sun/star/sdbcx/XRename.idl
index 41e8807232a9..53a2cce37839 100644
--- a/offapi/com/sun/star/sdbcx/XRename.idl
+++ b/offapi/com/sun/star/sdbcx/XRename.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbcx_XRename_idl__
#define __com_sun_star_sdbcx_XRename_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XRowLocate.idl b/offapi/com/sun/star/sdbcx/XRowLocate.idl
index e5942d97e335..4136c5852bf1 100644
--- a/offapi/com/sun/star/sdbcx/XRowLocate.idl
+++ b/offapi/com/sun/star/sdbcx/XRowLocate.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XRowLocate_idl__
#define __com_sun_star_sdbcx_XRowLocate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
index 58b441b2acde..cb3a32e31cb3 100644
--- a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XTablesSupplier_idl__
#define __com_sun_star_sdbcx_XTablesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XUser.idl b/offapi/com/sun/star/sdbcx/XUser.idl
index f99cbe1e5107..c5d4e3d2b16f 100644
--- a/offapi/com/sun/star/sdbcx/XUser.idl
+++ b/offapi/com/sun/star/sdbcx/XUser.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdbcx_XUser_idl__
#define __com_sun_star_sdbcx_XUser_idl__
-#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
#include <com/sun/star/sdbcx/XAuthorizable.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
index c1c77fddaf9c..1b4872246f07 100644
--- a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdbcx_XUsersSupplier_idl__
#define __com_sun_star_sdbcx_XUsersSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
index f0988c1c8bb1..1043e4ea544b 100644
--- a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdbcx_XViewsSupplier_idl__
#define __com_sun_star_sdbcx_XViewsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdbcx {
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index ca6573c9c13b..bc60f6808e67 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -30,7 +30,6 @@
#include <com/sun/star/security/XCertificateContainer.idl>
#include <com/sun/star/uno/XInterface.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/security/CertificateException.idl b/offapi/com/sun/star/security/CertificateException.idl
index 3edd5adb99ea..f5b930909019 100644
--- a/offapi/com/sun/star/security/CertificateException.idl
+++ b/offapi/com/sun/star/security/CertificateException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_CertificateException_idl__
#define __com_sun_star_security_CertificateException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/CryptographyException.idl b/offapi/com/sun/star/security/CryptographyException.idl
index d45ca6f76931..ad1b7d81e53e 100644
--- a/offapi/com/sun/star/security/CryptographyException.idl
+++ b/offapi/com/sun/star/security/CryptographyException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_CryptographyException_idl__
#define __com_sun_star_security_CryptographyException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
index 64ad581602c4..2a65dfd4fe54 100644
--- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
@@ -32,10 +32,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XDocumentDigitalSignatures.idl"
module com { module sun { module star { module security {
diff --git a/offapi/com/sun/star/security/EncryptionException.idl b/offapi/com/sun/star/security/EncryptionException.idl
index 64e17bf5d260..e386931dac5b 100644
--- a/offapi/com/sun/star/security/EncryptionException.idl
+++ b/offapi/com/sun/star/security/EncryptionException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_EncryptionException_idl__
#define __com_sun_star_security_EncryptionException_idl__
-#ifndef __com_sun_star_security_CryptographyException_idl__
#include <com/sun/star/security/CryptographyException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/KeyException.idl b/offapi/com/sun/star/security/KeyException.idl
index f323def3b585..0c2a4d68e36f 100644
--- a/offapi/com/sun/star/security/KeyException.idl
+++ b/offapi/com/sun/star/security/KeyException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_KeyException_idl__
#define __com_sun_star_security_KeyException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/NoPasswordException.idl b/offapi/com/sun/star/security/NoPasswordException.idl
index b11abbaf6cba..7ae79c18ceaa 100644
--- a/offapi/com/sun/star/security/NoPasswordException.idl
+++ b/offapi/com/sun/star/security/NoPasswordException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_NoPasswordException_idl__
#define __com_sun_star_security_NoPasswordException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
index 2b68c42b52ec..175e8bcbe8e9 100644
--- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl
+++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_SecurityInfrastructureException_idl__
#define __com_sun_star_security_SecurityInfrastructureException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/security/SignatureException.idl b/offapi/com/sun/star/security/SignatureException.idl
index d7bf72eb43cc..28fd76986e48 100644
--- a/offapi/com/sun/star/security/SignatureException.idl
+++ b/offapi/com/sun/star/security/SignatureException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_security_SignatureException_idl__
#define __com_sun_star_security_SignatureException_idl__
-#ifndef __com_sun_star_security_CryptographyException_idl__
#include <com/sun/star/security/CryptographyException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/setup/BaseAction.idl b/offapi/com/sun/star/setup/BaseAction.idl
index f3edc68d8859..cdd301887769 100644
--- a/offapi/com/sun/star/setup/BaseAction.idl
+++ b/offapi/com/sun/star/setup/BaseAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_BaseAction_idl__
#define __com_sun_star_setup_BaseAction_idl__
-#ifndef __com_sun_star_setup_ActionType_idl__
#include <com/sun/star/setup/ActionType.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/CopyFileAction.idl b/offapi/com/sun/star/setup/CopyFileAction.idl
index b7d8e8e900ea..e909e80683e5 100644
--- a/offapi/com/sun/star/setup/CopyFileAction.idl
+++ b/offapi/com/sun/star/setup/CopyFileAction.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_setup_CopyFileAction_idl__
#define __com_sun_star_setup_CopyFileAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/DeleteDirAction.idl b/offapi/com/sun/star/setup/DeleteDirAction.idl
index 59f358c1a76c..6c143cceb1a7 100644
--- a/offapi/com/sun/star/setup/DeleteDirAction.idl
+++ b/offapi/com/sun/star/setup/DeleteDirAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_DeleteDirAction_idl__
#define __com_sun_star_setup_DeleteDirAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/DeleteFileAction.idl b/offapi/com/sun/star/setup/DeleteFileAction.idl
index dc58ef733277..5993c37a0336 100644
--- a/offapi/com/sun/star/setup/DeleteFileAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFileAction.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_setup_DeleteFileAction_idl__
#define __com_sun_star_setup_DeleteFileAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/DeleteFolderAction.idl b/offapi/com/sun/star/setup/DeleteFolderAction.idl
index 2a5a1c56568f..2ce53b25bf55 100644
--- a/offapi/com/sun/star/setup/DeleteFolderAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_DeleteFolderAction_idl__
#define __com_sun_star_setup_DeleteFolderAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
index d17f39bcf135..01e83790c535 100644
--- a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__
#define __com_sun_star_setup_DeleteFolderItemAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/DownloadAction.idl b/offapi/com/sun/star/setup/DownloadAction.idl
index c83739715086..fcf13a342ddf 100644
--- a/offapi/com/sun/star/setup/DownloadAction.idl
+++ b/offapi/com/sun/star/setup/DownloadAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_DownloadAction_idl__
#define __com_sun_star_setup_DownloadAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/FontAction.idl b/offapi/com/sun/star/setup/FontAction.idl
index 5b8e54a3bc49..2eb110ecb43b 100644
--- a/offapi/com/sun/star/setup/FontAction.idl
+++ b/offapi/com/sun/star/setup/FontAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_FontAction_idl__
#define __com_sun_star_setup_FontAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/MakeDirAction.idl b/offapi/com/sun/star/setup/MakeDirAction.idl
index 3d2dd8a250ea..8956723463d1 100644
--- a/offapi/com/sun/star/setup/MakeDirAction.idl
+++ b/offapi/com/sun/star/setup/MakeDirAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_MakeDirAction_idl__
#define __com_sun_star_setup_MakeDirAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/MakeFolderAction.idl b/offapi/com/sun/star/setup/MakeFolderAction.idl
index 679c498703c2..f9b208aa8af7 100644
--- a/offapi/com/sun/star/setup/MakeFolderAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_MakeFolderAction_idl__
#define __com_sun_star_setup_MakeFolderAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/MakeFolderItemAction.idl b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
index d1de33a11a49..e0199164c557 100644
--- a/offapi/com/sun/star/setup/MakeFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_MakeFolderItemAction_idl__
#define __com_sun_star_setup_MakeFolderItemAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/MakeShortcutAction.idl b/offapi/com/sun/star/setup/MakeShortcutAction.idl
index 15c2bbcde561..9c072a761bbf 100644
--- a/offapi/com/sun/star/setup/MakeShortcutAction.idl
+++ b/offapi/com/sun/star/setup/MakeShortcutAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_MakeShortcutAction_idl__
#define __com_sun_star_setup_MakeShortcutAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
index 9f684b810fbe..72d8d694a1bb 100644
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ b/offapi/com/sun/star/setup/ProductRegistration.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_setup_ProductRegistration_idl__
#define __com_sun_star_setup_ProductRegistration_idl__
-#ifndef __com_sun_star_task_JobExecutor_idl__
#include <com/sun/star/task/JobExecutor.idl>
-#endif
-
-#ifndef __com_sun_star_task_XJob_idl__
#include <com/sun/star/task/XJob.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/ProfileItemAction.idl b/offapi/com/sun/star/setup/ProfileItemAction.idl
index 68d432d2022f..5a7679bad7cc 100644
--- a/offapi/com/sun/star/setup/ProfileItemAction.idl
+++ b/offapi/com/sun/star/setup/ProfileItemAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_ProfileItemAction_idl__
#define __com_sun_star_setup_ProfileItemAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/UnzipAction.idl b/offapi/com/sun/star/setup/UnzipAction.idl
index 034de904d5d2..9777d1f91e89 100644
--- a/offapi/com/sun/star/setup/UnzipAction.idl
+++ b/offapi/com/sun/star/setup/UnzipAction.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_setup_UnzipAction_idl__
#define __com_sun_star_setup_UnzipAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/WindowsRegistryAction.idl b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
index 33e9f839be3c..e37d67c5ba8d 100644
--- a/offapi/com/sun/star/setup/WindowsRegistryAction.idl
+++ b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_setup_WindowsRegistryAction_idl__
#define __com_sun_star_setup_WindowsRegistryAction_idl__
-#ifndef __com_sun_star_setup_BaseAction_idl__
#include <com/sun/star/setup/BaseAction.idl>
-#endif
module com { module sun { module star { module setup {
diff --git a/offapi/com/sun/star/setup/XSetup.idl b/offapi/com/sun/star/setup/XSetup.idl
index 68f35cda76ae..4c2b309be293 100644
--- a/offapi/com/sun/star/setup/XSetup.idl
+++ b/offapi/com/sun/star/setup/XSetup.idl
@@ -27,10 +27,7 @@
#ifndef __com_sun_star_setup_XSetup_idl__
#define __com_sun_star_setup_XSetup_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
#include <com/sun/star/setup/OSType.idl>
#include <com/sun/star/setup/UpdateType.idl>
#include <com/sun/star/setup/ModuleInfo.idl>
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 014b5c84b82f..52ca2a603eec 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sheet_AccessibleCell_idl__
#define __com_sun_star_sheet_AccessibleCell_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 10e77f7bcbc6..29492a7971cb 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AccessibleCsvCell_idl__
#define __com_sun_star_sheet_AccessibleCsvCell_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 1ee7df9ddba1..86562c70345b 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AccessibleCsvRuler_idl__
#define __com_sun_star_sheet_AccessibleCsvRuler_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 95f4a91bdf6a..ca8e9a7ee553 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_AccessibleCsvTable_idl__
#define __com_sun_star_sheet_AccessibleCsvTable_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index b7e919c29b1b..aa290fc7f388 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
#define __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index 4a89ad0bcd30..9d01b98dd6db 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheet_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheet_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 1d6425b400fc..f72dc383b649 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index 20b612071312..a06526caf73f 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ActivationEvent.idl b/offapi/com/sun/star/sheet/ActivationEvent.idl
index f53c3509874b..136932433380 100644
--- a/offapi/com/sun/star/sheet/ActivationEvent.idl
+++ b/offapi/com/sun/star/sheet/ActivationEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_ActivationEvent_idl__
#define __com_sun_star_sheet_ActivationEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AddIn.idl b/offapi/com/sun/star/sheet/AddIn.idl
index 8f76f268416e..8a7bbaf5125d 100644
--- a/offapi/com/sun/star/sheet/AddIn.idl
+++ b/offapi/com/sun/star/sheet/AddIn.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AddIn_idl__
#define __com_sun_star_sheet_AddIn_idl__
-#ifndef __com_sun_star_lang_XServiceName_idl__
#include <com/sun/star/lang/XServiceName.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAddIn_idl__
#include <com/sun/star/sheet/XAddIn.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
#include <com/sun/star/sheet/XCompatibilityNames.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotation.idl b/offapi/com/sun/star/sheet/CellAnnotation.idl
index 16c2f3620639..b29c11763166 100644
--- a/offapi/com/sun/star/sheet/CellAnnotation.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_CellAnnotation_idl__
#define __com_sun_star_sheet_CellAnnotation_idl__
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSimpleText_idl__
#include <com/sun/star/text/XSimpleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotationShape.idl b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
index 1d5cc467f299..77d84bfd42c4 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationShape.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAnnotationShape_idl__
#define __com_sun_star_sheet_CellAnnotationShape_idl__
-#ifndef __com_sun_star_drawing_CaptionShape_idl__
#include <com/sun/star/drawing/CaptionShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotations.idl b/offapi/com/sun/star/sheet/CellAnnotations.idl
index 5831655d4634..81b705cc41e1 100644
--- a/offapi/com/sun/star/sheet/CellAnnotations.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotations.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_CellAnnotations_idl__
#define __com_sun_star_sheet_CellAnnotations_idl__
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
index 1e70eb30c5c3..a54f2562e718 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
#define __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLink.idl b/offapi/com/sun/star/sheet/CellAreaLink.idl
index 90e51f941eb8..f251511b2484 100644
--- a/offapi/com/sun/star/sheet/CellAreaLink.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLink.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_CellAreaLink_idl__
#define __com_sun_star_sheet_CellAreaLink_idl__
-#ifndef __com_sun_star_sheet_XAreaLink_idl__
#include <com/sun/star/sheet/XAreaLink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLinks.idl b/offapi/com/sun/star/sheet/CellAreaLinks.idl
index 62b601752c10..ff822d1535fd 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinks.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_CellAreaLinks_idl__
#define __com_sun_star_sheet_CellAreaLinks_idl__
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
index 6fda9e4f824d..f7bd7a421d7e 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
#define __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellFormatRanges.idl b/offapi/com/sun/star/sheet/CellFormatRanges.idl
index c3002e1c80f6..7a7541fa42c6 100644
--- a/offapi/com/sun/star/sheet/CellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_CellFormatRanges_idl__
#define __com_sun_star_sheet_CellFormatRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
index ef945a036225..4cfd44edb5c0 100644
--- a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
#define __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Cells.idl b/offapi/com/sun/star/sheet/Cells.idl
index 125c42f516c2..45eecae78733 100644
--- a/offapi/com/sun/star/sheet/Cells.idl
+++ b/offapi/com/sun/star/sheet/Cells.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_Cells_idl__
#define __com_sun_star_sheet_Cells_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellsEnumeration.idl b/offapi/com/sun/star/sheet/CellsEnumeration.idl
index 53e7a59a86e1..7315a4cd28e0 100644
--- a/offapi/com/sun/star/sheet/CellsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellsEnumeration_idl__
#define __com_sun_star_sheet_CellsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 12a8fd5db8e1..895b93586c5d 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ComplexReference_idl__
#define __com_sun_star_sheet_ComplexReference_idl__
-#ifndef __com_sun_star_sheet_SingleReference_idl__
#include <com/sun/star/sheet/SingleReference.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
index 7c070b721ee4..07c0f742ddee 100644
--- a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ConsolidationDescriptor_idl__
#define __com_sun_star_sheet_ConsolidationDescriptor_idl__
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELink.idl b/offapi/com/sun/star/sheet/DDELink.idl
index 0ef60285ed3c..b8673a8135be 100644
--- a/offapi/com/sun/star/sheet/DDELink.idl
+++ b/offapi/com/sun/star/sheet/DDELink.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DDELink_idl__
#define __com_sun_star_sheet_DDELink_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
#include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
#include <com/sun/star/sheet/XDDELinkResults.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinkInfo.idl b/offapi/com/sun/star/sheet/DDELinkInfo.idl
index 96c4b8e5c244..d81168556d6d 100644
--- a/offapi/com/sun/star/sheet/DDELinkInfo.idl
+++ b/offapi/com/sun/star/sheet/DDELinkInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_DDELinkInfo_idl__
#define __com_sun_star_sheet_DDELinkInfo_idl__
-#ifndef __com_sun_star_sheet_DDEItemInfo_idl__
#include <com/sun/star/sheet/DDEItemInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinks.idl b/offapi/com/sun/star/sheet/DDELinks.idl
index 8a8d8b093756..4b01686b2317 100644
--- a/offapi/com/sun/star/sheet/DDELinks.idl
+++ b/offapi/com/sun/star/sheet/DDELinks.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_DDELinks_idl__
#define __com_sun_star_sheet_DDELinks_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sheet_XDDELinks_idl__
#include <com/sun/star/sheet/XDDELinks.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
index 93a19a052c88..559d5d097395 100644
--- a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DDELinksEnumeration_idl__
#define __com_sun_star_sheet_DDELinksEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 939ff469b674..1d6752d63658 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotTableDescriptor_idl__
#define __com_sun_star_sheet_DataPilotTableDescriptor_idl__
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
#include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl b/offapi/com/sun/star/sheet/DataPilotField.idl
index 68a4fa1c1e2c..486e5aaf16c2 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_sheet_DataPilotField_idl__
#define __com_sun_star_sheet_DataPilotField_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
#include <com/sun/star/sheet/XDataPilotFieldGrouping.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
#include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
#include <com/sun/star/sheet/DataPilotFieldReference.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldLayoutInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldLayoutInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldAutoShowInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldSortInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index da07a768a57d..b0d48dfd7c17 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroup_idl__
#define __com_sun_star_sheet_DataPilotFieldGroup_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
index f486cb0d689a..97ab46ca8505 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 380dab374dc5..1c8bd723e61b 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
index 40a65552aa99..8753f2ea5e7a 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 544863db4d4b..0b7df0436660 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroups_idl__
#define __com_sun_star_sheet_DataPilotFieldGroups_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
index 6b94a42df494..366eb173bbe0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
index 163917c79b78..f094cbcd8993 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
#define __com_sun_star_sheet_DataPilotFieldReference_idl__
-#ifndef __com_sun_star_sheet_DataPilotFieldReferenceItemType_idl__
#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
index b024613d6e51..0758eb4f29f0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
#define __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
-#ifndef __com_sun_star_sheet_DataPilotFieldSortMode_idl__
#include <com/sun/star/sheet/DataPilotFieldSortMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFields.idl b/offapi/com/sun/star/sheet/DataPilotFields.idl
index 1b3946bc88dc..32197631e138 100644
--- a/offapi/com/sun/star/sheet/DataPilotFields.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFields.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotFields_idl__
#define __com_sun_star_sheet_DataPilotFields_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
index e96099eae8f7..e5f554f19ac9 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItem.idl b/offapi/com/sun/star/sheet/DataPilotItem.idl
index 84be9bdc879a..6b6e0b94eb3e 100644
--- a/offapi/com/sun/star/sheet/DataPilotItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItem.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotItem_idl__
#define __com_sun_star_sheet_DataPilotItem_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItems.idl b/offapi/com/sun/star/sheet/DataPilotItems.idl
index edc3bd474e04..832fdda81046 100644
--- a/offapi/com/sun/star/sheet/DataPilotItems.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItems.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotItems_idl__
#define __com_sun_star_sheet_DataPilotItems_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
index 074beb4e6215..526691277d81 100644
--- a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl b/offapi/com/sun/star/sheet/DataPilotSource.idl
index 3629d48fd756..4e5a000343c3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotSource_idl__
#define __com_sun_star_sheet_DataPilotSource_idl__
-#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
#include <com/sun/star/sheet/XDimensionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
#include <com/sun/star/sheet/XDataPilotResults.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 9f5961731a05..82d4294a5636 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_sheet_DataPilotSourceDimension_idl__
#define __com_sun_star_sheet_DataPilotSourceDimension_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
#include <com/sun/star/sheet/XHierarchiesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
#include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableFilterField_idl__
#include <com/sun/star/sheet/TableFilterField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index 080f529e90e4..ebb58eda79f3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceDimensions_idl__
#define __com_sun_star_sheet_DataPilotSourceDimensions_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index f283e157c8e1..83d907bc6800 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
#define __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
index ad300f8845e6..f228b9908e70 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
#define __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
#include <com/sun/star/sheet/XLevelsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
index c94880508a2c..a20a193e068b 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_DataPilotSourceLevel_idl__
#define __com_sun_star_sheet_DataPilotSourceLevel_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
#include <com/sun/star/sheet/XMembersSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
#include <com/sun/star/sheet/XDataPilotMemberResults.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
index 5e09f51de346..9c00787bdfab 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceLevels_idl__
#define __com_sun_star_sheet_DataPilotSourceLevels_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
index c83f1031e57a..56ddd6250d1a 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotSourceMember_idl__
#define __com_sun_star_sheet_DataPilotSourceMember_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
index 02a93be58504..668e2fabb2d1 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceMembers_idl__
#define __com_sun_star_sheet_DataPilotSourceMembers_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index 19c5b143a952..0a1c07985ec6 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotTable_idl__
#define __com_sun_star_sheet_DataPilotTable_idl__
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTables.idl b/offapi/com/sun/star/sheet/DataPilotTables.idl
index f8dc00fa8e27..bdb3192d1564 100644
--- a/offapi/com/sun/star/sheet/DataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTables.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotTables_idl__
#define __com_sun_star_sheet_DataPilotTables_idl__
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
index a8b52e65425c..72b8f67c47a7 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
#define __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
index 0044b8801a03..d6ef37d58fc7 100644
--- a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DatabaseImportDescriptor_idl__
#define __com_sun_star_sheet_DatabaseImportDescriptor_idl__
-#ifndef __com_sun_star_sheet_DataImportMode_idl__
#include <com/sun/star/sheet/DataImportMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index 1a2e189ff14e..a906198a7fda 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_sheet_DatabaseRange_idl__
#define __com_sun_star_sheet_DatabaseRange_idl__
-#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
#include <com/sun/star/sheet/XDatabaseRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRanges.idl b/offapi/com/sun/star/sheet/DatabaseRanges.idl
index aed4f86aa308..68a12a622bbe 100644
--- a/offapi/com/sun/star/sheet/DatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRanges.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DatabaseRanges_idl__
#define __com_sun_star_sheet_DatabaseRanges_idl__
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
index 56dde2367734..2e2cc1725312 100644
--- a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
#define __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl
index 17bc923477dd..62f8f0dc6f53 100644
--- a/offapi/com/sun/star/sheet/DocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/DocumentSettings.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_DocumentSettings_idl__
#define __com_sun_star_sheet_DocumentSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index 0ad8d6dadeb4..9abac7c24def 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
#define __com_sun_star_sheet_ExternalLinkInfo_idl__
-#ifndef __com_sun_star_sheet_ExternalLinkType_idl__
#include <com/sun/star/sheet/ExternalLinkType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index 0c80854db357..6c70247a672f 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#define __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index acf4eca4910b..8fac32c8bd31 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_FormulaParser_idl__
#define __com_sun_star_sheet_FormulaParser_idl__
-#ifndef __com_sun_star_beans_PropertySet_idl__
#include <com/sun/star/beans/PropertySet.idl>
-#endif
-#ifndef __com_sun_star_sheet_XFormulaParser_idl__
#include <com/sun/star/sheet/XFormulaParser.idl>
-#endif
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
#include <com/sun/star/sheet/ExternalLinkInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl
index 389acca5daa0..e9ab212f001c 100644
--- a/offapi/com/sun/star/sheet/FunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/FunctionAccess.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_FunctionAccess_idl__
#define __com_sun_star_sheet_FunctionAccess_idl__
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
#include <com/sun/star/sheet/XFunctionAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescription.idl b/offapi/com/sun/star/sheet/FunctionDescription.idl
index 2e36034ea76b..31f57d0aa969 100644
--- a/offapi/com/sun/star/sheet/FunctionDescription.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FunctionDescription_idl__
#define __com_sun_star_sheet_FunctionDescription_idl__
-#ifndef __com_sun_star_sheet_FunctionArgument_idl__
#include <com/sun/star/sheet/FunctionArgument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
index 6749ea019903..0fd69f684c49 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
#define __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptions.idl b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
index 842979bb4d1e..18fa549f3c7c 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_FunctionDescriptions_idl__
#define __com_sun_star_sheet_FunctionDescriptions_idl__
-#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
#include <com/sun/star/sheet/XFunctionDescriptions.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 508992fd1785..ec6cbdaaee2f 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_GlobalSheetSettings_idl__
#define __com_sun_star_sheet_GlobalSheetSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/HeaderFooterContent.idl b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
index 39c551c0880c..0ce900c9b1c5 100644
--- a/offapi/com/sun/star/sheet/HeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_HeaderFooterContent_idl__
#define __com_sun_star_sheet_HeaderFooterContent_idl__
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRange.idl b/offapi/com/sun/star/sheet/LabelRange.idl
index a5e1b98302a2..62781cc7771a 100644
--- a/offapi/com/sun/star/sheet/LabelRange.idl
+++ b/offapi/com/sun/star/sheet/LabelRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LabelRange_idl__
#define __com_sun_star_sheet_LabelRange_idl__
-#ifndef __com_sun_star_sheet_XLabelRange_idl__
#include <com/sun/star/sheet/XLabelRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRanges.idl b/offapi/com/sun/star/sheet/LabelRanges.idl
index d8659f7a625b..83510c6141ab 100644
--- a/offapi/com/sun/star/sheet/LabelRanges.idl
+++ b/offapi/com/sun/star/sheet/LabelRanges.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_LabelRanges_idl__
#define __com_sun_star_sheet_LabelRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
index 18817df0d228..00830e32aba0 100644
--- a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LabelRangesEnumeration_idl__
#define __com_sun_star_sheet_LabelRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LocalizedName.idl b/offapi/com/sun/star/sheet/LocalizedName.idl
index 1f8a7a8eebf6..1d6c7b7d2ead 100644
--- a/offapi/com/sun/star/sheet/LocalizedName.idl
+++ b/offapi/com/sun/star/sheet/LocalizedName.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LocalizedName_idl__
#define __com_sun_star_sheet_LocalizedName_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 445bf984c7e6..8dd4a7727b93 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_NamedRange_idl__
#define __com_sun_star_sheet_NamedRange_idl__
-#ifndef __com_sun_star_sheet_XNamedRange_idl__
#include <com/sun/star/sheet/XNamedRange.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRanges.idl b/offapi/com/sun/star/sheet/NamedRanges.idl
index e7be40c8c6e5..2f062d84016d 100644
--- a/offapi/com/sun/star/sheet/NamedRanges.idl
+++ b/offapi/com/sun/star/sheet/NamedRanges.idl
@@ -28,22 +28,11 @@
#ifndef __com_sun_star_sheet_NamedRanges_idl__
#define __com_sun_star_sheet_NamedRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
index 9bfeea931a01..0c369730cc9a 100644
--- a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_NamedRangesEnumeration_idl__
#define __com_sun_star_sheet_NamedRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl
index b427b67f28ea..f4edee3fad01 100644
--- a/offapi/com/sun/star/sheet/NoConvergenceException.idl
+++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_NoConvergenceException_idl__
#define __com_sun_star_sheet_NoConvergenceException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
index 859466b51d5d..b1789b764ab1 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#define __com_sun_star_sheet_RangeSelectionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 636a0bcf8f31..588b2b671641 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_RecentFunctions_idl__
#define __com_sun_star_sheet_RecentFunctions_idl__
-#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
#include <com/sun/star/sheet/XRecentFunctions.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ResultEvent.idl b/offapi/com/sun/star/sheet/ResultEvent.idl
index 3fc5184da6ae..ed77a0710244 100644
--- a/offapi/com/sun/star/sheet/ResultEvent.idl
+++ b/offapi/com/sun/star/sheet/ResultEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ResultEvent_idl__
#define __com_sun_star_sheet_ResultEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Scenario.idl b/offapi/com/sun/star/sheet/Scenario.idl
index a47b2c3df484..bb9632b04698 100644
--- a/offapi/com/sun/star/sheet/Scenario.idl
+++ b/offapi/com/sun/star/sheet/Scenario.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_Scenario_idl__
#define __com_sun_star_sheet_Scenario_idl__
-#ifndef __com_sun_star_sheet_XScenario_idl__
#include <com/sun/star/sheet/XScenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
#include <com/sun/star/sheet/XScenarioEnhanced.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Scenarios.idl b/offapi/com/sun/star/sheet/Scenarios.idl
index 31f3da181f0b..b20438c9af53 100644
--- a/offapi/com/sun/star/sheet/Scenarios.idl
+++ b/offapi/com/sun/star/sheet/Scenarios.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_Scenarios_idl__
#define __com_sun_star_sheet_Scenarios_idl__
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
index ca6c0a7b8335..fc6090d1e8f1 100644
--- a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
+++ b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ScenariosEnumeration_idl__
#define __com_sun_star_sheet_ScenariosEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl
index 0aca01b81b52..38c6f29171df 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sheet_Shape_idl__
#define __com_sun_star_sheet_Shape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl
index c1117388ff35..7b82aa8c4c35 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -29,95 +29,32 @@
#define __com_sun_star_sheet_SheetCell_idl__
-#ifndef __com_sun_star_table_Cell_idl__
#include <com/sun/star/table/Cell.idl>
-#endif
-
-#ifndef __com_sun_star_text_Text_idl__
#include <com/sun/star/text/Text.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
#include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellAddressable_idl__
#include <com/sun/star/sheet/XCellAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
#include <com/sun/star/sheet/XSheetAnnotationAnchor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
#include <com/sun/star/text/XTextFieldsSupplier.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_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellCursor.idl b/offapi/com/sun/star/sheet/SheetCellCursor.idl
index 23724f423174..eaaa9e2682f8 100644
--- a/offapi/com/sun/star/sheet/SheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/SheetCellCursor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_SheetCellCursor_idl__
#define __com_sun_star_sheet_SheetCellCursor_idl__
-#ifndef __com_sun_star_table_CellCursor_idl__
#include <com/sun/star/table/CellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
#include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
#include <com/sun/star/sheet/XSheetCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
#include <com/sun/star/sheet/XUsedAreaCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl b/offapi/com/sun/star/sheet/SheetCellRange.idl
index d841d6e1eef0..a275751feca9 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -29,135 +29,42 @@
#define __com_sun_star_sheet_SheetCellRange_idl__
-#ifndef __com_sun_star_table_CellRange_idl__
#include <com/sun/star/table/CellRange.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XMergeable_idl__
#include <com/sun/star/util/XMergeable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
#include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
#include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
#include <com/sun/star/sheet/XCellRangeFormula.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
#include <com/sun/star/sheet/XCellRangeAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellSeries_idl__
#include <com/sun/star/sheet/XCellSeries.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
#include <com/sun/star/sheet/XArrayFormulaRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
#include <com/sun/star/sheet/XMultipleOperation.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XImportable_idl__
#include <com/sun/star/util/XImportable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
#include <com/sun/star/sheet/XSubTotalCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
#include <com/sun/star/sheet/XSheetFilterableEx.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
#include <com/sun/star/sheet/XCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
#include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.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_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index 7a265d1e2cd6..14272aa36e36 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -29,67 +29,25 @@
#define __com_sun_star_sheet_SheetCellRanges_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
#include <com/sun/star/sheet/XSheetCellRangeContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
index f0989e3cffd2..173c4b180de5 100644
--- a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
#define __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLink.idl b/offapi/com/sun/star/sheet/SheetLink.idl
index b81b79ce19be..4dd3ce69c0b6 100644
--- a/offapi/com/sun/star/sheet/SheetLink.idl
+++ b/offapi/com/sun/star/sheet/SheetLink.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_SheetLink_idl__
#define __com_sun_star_sheet_SheetLink_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLinks.idl b/offapi/com/sun/star/sheet/SheetLinks.idl
index ee960b37e57c..5f9d7e603361 100644
--- a/offapi/com/sun/star/sheet/SheetLinks.idl
+++ b/offapi/com/sun/star/sheet/SheetLinks.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_SheetLinks_idl__
#define __com_sun_star_sheet_SheetLinks_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
index 85749701c85a..02cc2696b21b 100644
--- a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SheetLinksEnumeration_idl__
#define __com_sun_star_sheet_SheetLinkssEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetRangesQuery.idl b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
index 623220a1df20..adae1442e915 100644
--- a/offapi/com/sun/star/sheet/SheetRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#define __com_sun_star_sheet_SheetRangesQuery_idl__
-#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
#include <com/sun/star/sheet/XCellRangesQuery.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
#include <com/sun/star/sheet/XFormulaQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
index 64e1e240434c..36cdf79f2e9d 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_SheetSortDescriptor_idl__
#define __com_sun_star_sheet_SheetSortDescriptor_idl__
-#ifndef __com_sun_star_table_TableSortDescriptor_idl__
#include <com/sun/star/table/TableSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
index 6c0723c06d55..5a694cd93468 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_SheetSortDescriptor2_idl__
#define __com_sun_star_sheet_SheetSortDescriptor2_idl__
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
#include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Solver.idl b/offapi/com/sun/star/sheet/Solver.idl
index 25fb5ac92f41..11aad514ae5d 100644
--- a/offapi/com/sun/star/sheet/Solver.idl
+++ b/offapi/com/sun/star/sheet/Solver.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_Solver_idl__
#define __com_sun_star_sheet_Solver_idl__
-#ifndef __com_sun_star_sheet_XSolver_idl__
#include <com/sun/star/sheet/XSolver.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SolverConstraint.idl b/offapi/com/sun/star/sheet/SolverConstraint.idl
index 10d735f92a15..cff56823c253 100644
--- a/offapi/com/sun/star/sheet/SolverConstraint.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraint.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_SolverConstraint_idl__
#define __com_sun_star_sheet_SolverConstraint_idl__
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraintOperator_idl__
#include <com/sun/star/sheet/SolverConstraintOperator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl
index 0b21a050d099..4458b83ec1f3 100644
--- a/offapi/com/sun/star/sheet/Spreadsheet.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheet.idl
@@ -28,74 +28,23 @@
#ifndef __com_sun_star_sheet_Spreadsheet_idl__
#define __com_sun_star_sheet_Spreadsheet_idl__
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
#include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
#include <com/sun/star/sheet/XDataPilotTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
#include <com/sun/star/drawing/XDrawPageSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableChartsSupplier_idl__
#include <com/sun/star/table/XTableChartsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
#include <com/sun/star/sheet/XCellRangeMovement.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XPrintAreas_idl__
#include <com/sun/star/sheet/XPrintAreas.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
#include <com/sun/star/sheet/XSheetPageBreak.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOutline_idl__
#include <com/sun/star/sheet/XSheetOutline.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
#include <com/sun/star/sheet/XSheetAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
#include <com/sun/star/sheet/XSheetLinkable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Scenario_idl__
#include <com/sun/star/sheet/Scenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
#include <com/sun/star/sheet/XExternalSheetName.idl>
-#endif
-
#include <com/sun/star/util/Color.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
index 3c5ad45d7942..b3a479b9c5dc 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
@@ -28,91 +28,31 @@
#ifndef __com_sun_star_sheet_SpreadsheetDocument_idl__
#define __com_sun_star_sheet_SpreadsheetDocument_idl__
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
#include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCalculatable_idl__
#include <com/sun/star/sheet/XCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
#include <com/sun/star/sheet/XDocumentAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidatable_idl__
#include <com/sun/star/sheet/XConsolidatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XGoalSeek_idl__
#include <com/sun/star/sheet/XGoalSeek.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalDocLinks_idl__
#include <com/sun/star/sheet/XExternalDocLinks.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index e89ae136053b..fddd8255e90a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#define __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 75b685071eb9..29102eb10ea6 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_SpreadsheetDrawPage_idl__
#define __com_sun_star_sheet_SpreadsheetDrawPage_idl__
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetView.idl b/offapi/com/sun/star/sheet/SpreadsheetView.idl
index 40ade27fedad..ea0a9e1462ae 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetView.idl
@@ -27,53 +27,18 @@
#ifndef __com_sun_star_sheet_SpreadsheetView_idl__
#define __com_sun_star_sheet_SpreadsheetView_idl__
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
#include <com/sun/star/sheet/SpreadsheetViewSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
#include <com/sun/star/sheet/SpreadsheetViewPane.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
#include <com/sun/star/sheet/XSpreadsheetView.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewSplitable_idl__
#include <com/sun/star/sheet/XViewSplitable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewFreezable_idl__
#include <com/sun/star/sheet/XViewFreezable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XRangeSelection_idl__
#include <com/sun/star/sheet/XRangeSelection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
#include <com/sun/star/sheet/XActivationBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
#include <com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
index 254601559a16..71c0796ea822 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
#define __com_sun_star_sheet_SpreadsheetViewPane_idl__
-#ifndef __com_sun_star_sheet_XViewPane_idl__
#include <com/sun/star/sheet/XViewPane.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-#ifndef __com_sun_star_view_XControlAccess_idl__
#include <com/sun/star/view/XControlAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
index de2d6c70fc8c..e9e6736cedf7 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
#define __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index c1b56ff7ffc6..208d7ac71b3a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -28,13 +28,9 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
#define __com_sun_star_sheet_SpreadsheetViewSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Spreadsheets.idl b/offapi/com/sun/star/sheet/Spreadsheets.idl
index 0e04297f1a99..8b7b19236690 100644
--- a/offapi/com/sun/star/sheet/Spreadsheets.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheets.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_Spreadsheets_idl__
#define __com_sun_star_sheet_Spreadsheets_idl__
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
#include <com/sun/star/sheet/XCellRangesAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
index e42bb9d9d93b..306e005efa02 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
#define __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalColumn.idl b/offapi/com/sun/star/sheet/SubTotalColumn.idl
index 45ebf2b9853e..65401eee335a 100644
--- a/offapi/com/sun/star/sheet/SubTotalColumn.idl
+++ b/offapi/com/sun/star/sheet/SubTotalColumn.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#define __com_sun_star_sheet_SubTotalColumn_idl__
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
index 4fe66bd28d14..24ad58d8e0cb 100644
--- a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
@@ -28,19 +28,10 @@
#ifndef __com_sun_star_sheet_SubTotalDescriptor_idl__
#define __com_sun_star_sheet_SubTotalDescriptor_idl__
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalField.idl b/offapi/com/sun/star/sheet/SubTotalField.idl
index bbec0c9706e8..c5dfe04f2b98 100644
--- a/offapi/com/sun/star/sheet/SubTotalField.idl
+++ b/offapi/com/sun/star/sheet/SubTotalField.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalField_idl__
#define __com_sun_star_sheet_SubTotalField_idl__
-#ifndef __com_sun_star_sheet_XSubTotalField_idl__
#include <com/sun/star/sheet/XSubTotalField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
index 49d6523a9d93..1f57de84cc97 100644
--- a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
#define __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormat.idl b/offapi/com/sun/star/sheet/TableAutoFormat.idl
index 8f9af3b41ef7..90e11602b7f2 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormat.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormat.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_TableAutoFormat_idl__
#define __com_sun_star_sheet_TableAutoFormat_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
index 636ca5d6e856..fe72e1ca2990 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
#define __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index 4ed00ff60374..9e172bde844b 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -28,41 +28,15 @@
#ifndef __com_sun_star_sheet_TableAutoFormatField_idl__
#define __com_sun_star_sheet_TableAutoFormatField_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
#include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
#include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
#include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
#include <com/sun/star/table/TableBorder.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormats.idl b/offapi/com/sun/star/sheet/TableAutoFormats.idl
index bffc1cdccbb2..5099c2d590ea 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormats.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormats.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_TableAutoFormats_idl__
#define __com_sun_star_sheet_TableAutoFormats_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
index 3d7b19ed411c..035144825ddf 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
#define __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableCellStyle.idl b/offapi/com/sun/star/sheet/TableCellStyle.idl
index 94559721145a..4273637f6ff5 100644
--- a/offapi/com/sun/star/sheet/TableCellStyle.idl
+++ b/offapi/com/sun/star/sheet/TableCellStyle.idl
@@ -28,29 +28,12 @@
#ifndef __com_sun_star_sheet_TableCellStyle_idl__
#define __com_sun_star_sheet_TableCellStyle_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CellStyle_idl__
#include <com/sun/star/style/CellStyle.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntry.idl b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
index d0a10cd8f4fc..9888a9dd2753 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_TableConditionalEntry_idl__
#define __com_sun_star_sheet_TableConditionalEntry_idl__
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
#include <com/sun/star/sheet/XSheetConditionalEntry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
index 815563a4aa93..2100a715a1c9 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
#define __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalFormat.idl b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
index 4c21a61ce712..4780e1424c42 100644
--- a/offapi/com/sun/star/sheet/TableConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_TableConditionalFormat_idl__
#define __com_sun_star_sheet_TableConditionalFormat_idl__
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TablePageStyle.idl b/offapi/com/sun/star/sheet/TablePageStyle.idl
index 686fb113d62c..8e3ae763bcb8 100644
--- a/offapi/com/sun/star/sheet/TablePageStyle.idl
+++ b/offapi/com/sun/star/sheet/TablePageStyle.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_TablePageStyle_idl__
#define __com_sun_star_sheet_TablePageStyle_idl__
-#ifndef __com_sun_star_style_PageStyle_idl__
#include <com/sun/star/style/PageStyle.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableValidation.idl b/offapi/com/sun/star/sheet/TableValidation.idl
index f71ab2b1e6aa..09e866fab371 100644
--- a/offapi/com/sun/star/sheet/TableValidation.idl
+++ b/offapi/com/sun/star/sheet/TableValidation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_TableValidation_idl__
#define __com_sun_star_sheet_TableValidation_idl__
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationType_idl__
#include <com/sun/star/sheet/ValidationType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationAlertStyle_idl__
#include <com/sun/star/sheet/ValidationAlertStyle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
index d8edb544e2d9..43a19c3bd4d1 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_UniqueCellFormatRanges_idl__
#define __com_sun_star_sheet_UniqueCellFormatRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
index ebfda93bf203..181a9b654e21 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
#define __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/VolatileResult.idl b/offapi/com/sun/star/sheet/VolatileResult.idl
index f6dafdb9c356..ebadf4b0ffba 100644
--- a/offapi/com/sun/star/sheet/VolatileResult.idl
+++ b/offapi/com/sun/star/sheet/VolatileResult.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_VolatileResult_idl__
#define __com_sun_star_sheet_VolatileResult_idl__
-#ifndef __com_sun_star_sheet_XVolatileResult_idl__
#include <com/sun/star/sheet/XVolatileResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
index e49a97e21d33..dad59c19f2a1 100644
--- a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
#define __com_sun_star_sheet_XActivationBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
#include <com/sun/star/sheet/XActivationEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationEventListener.idl b/offapi/com/sun/star/sheet/XActivationEventListener.idl
index f5478f8e07c7..42537aa2ce09 100644
--- a/offapi/com/sun/star/sheet/XActivationEventListener.idl
+++ b/offapi/com/sun/star/sheet/XActivationEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
#define __com_sun_star_sheet_XActivationEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ActivationEvent_idl__
#include <com/sun/star/sheet/ActivationEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAddIn.idl b/offapi/com/sun/star/sheet/XAddIn.idl
index f506de2e5587..fc7ef5b167d9 100644
--- a/offapi/com/sun/star/sheet/XAddIn.idl
+++ b/offapi/com/sun/star/sheet/XAddIn.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XAddIn_idl__
#define __com_sun_star_sheet_XAddIn_idl__
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAreaLink.idl b/offapi/com/sun/star/sheet/XAreaLink.idl
index 9d92564945c0..097c9ca786fc 100644
--- a/offapi/com/sun/star/sheet/XAreaLink.idl
+++ b/offapi/com/sun/star/sheet/XAreaLink.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XAreaLink_idl__
#define __com_sun_star_sheet_XAreaLink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAreaLinks.idl b/offapi/com/sun/star/sheet/XAreaLinks.idl
index aca3f2ac57ed..4a66e3e883b8 100644
--- a/offapi/com/sun/star/sheet/XAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/XAreaLinks.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#define __com_sun_star_sheet_XAreaLinks_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
index 6941b8c5808d..8e5bce814cff 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
#define __com_sun_star_sheet_XArrayFormulaRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
index 6761606bc4dd..fe3e4e4a0506 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XArrayFormulaTokens_idl__
#define __com_sun_star_sheet_XArrayFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCalculatable.idl b/offapi/com/sun/star/sheet/XCalculatable.idl
index 4c46f8b5829a..82546ba41ec8 100644
--- a/offapi/com/sun/star/sheet/XCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XCalculatable.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCalculatable_idl__
#define __com_sun_star_sheet_XCalculatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellAddressable.idl b/offapi/com/sun/star/sheet/XCellAddressable.idl
index b057301da9fd..8b7a2ac3820f 100644
--- a/offapi/com/sun/star/sheet/XCellAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellAddressable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellAddressable_idl__
#define __com_sun_star_sheet_XCellAddressable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
index f2c660513fdd..4325aa901053 100644
--- a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
#define __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
index f0391fafd856..f2287d3954c9 100644
--- a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
#define __com_sun_star_sheet_XCellRangeAddressable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeData.idl b/offapi/com/sun/star/sheet/XCellRangeData.idl
index 3e08587a3aa3..4931573da986 100644
--- a/offapi/com/sun/star/sheet/XCellRangeData.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeData.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#define __com_sun_star_sheet_XCellRangeData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sheet {
diff --git a/offapi/com/sun/star/sheet/XCellRangeFormula.idl b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
index 3de2eba0ddde..96e590477433 100644
--- a/offapi/com/sun/star/sheet/XCellRangeFormula.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
#define __com_sun_star_sheet_XCellRangeFormula_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeMovement.idl b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
index 230c3606b845..1362c94f4f3e 100644
--- a/offapi/com/sun/star/sheet/XCellRangeMovement.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
#define __com_sun_star_sheet_XCellRangeMovement_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
#include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellDeleteMode_idl__
#include <com/sun/star/sheet/CellDeleteMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
index 95ba302b90fe..cc8a27081641 100644
--- a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#define __com_sun_star_sheet_XCellRangeReferrer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangesAccess.idl b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
index d22d2a4c6e6e..c82dfd7d521c 100644
--- a/offapi/com/sun/star/sheet/XCellRangesAccess.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
#define __com_sun_star_sheet_XCellRangesAccess_idl__
-#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_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index 44c9b8b4053b..0a772c707d35 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
#define __com_sun_star_sheet_XCellRangesQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellSeries.idl b/offapi/com/sun/star/sheet/XCellSeries.idl
index 27e6794b6eec..489b0bd8c613 100644
--- a/offapi/com/sun/star/sheet/XCellSeries.idl
+++ b/offapi/com/sun/star/sheet/XCellSeries.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XCellSeries_idl__
#define __com_sun_star_sheet_XCellSeries_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDirection_idl__
#include <com/sun/star/sheet/FillDirection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillMode_idl__
#include <com/sun/star/sheet/FillMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDateMode_idl__
#include <com/sun/star/sheet/FillDateMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
index 28170f8eadc8..e7a6ae15fad2 100644
--- a/offapi/com/sun/star/sheet/XCompatibilityNames.idl
+++ b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
#define __com_sun_star_sheet_XCompatibilityNames_idl__
-#ifndef __com_sun_star_sheet_LocalizedName_idl__
#include <com/sun/star/sheet/LocalizedName.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XConsolidatable.idl b/offapi/com/sun/star/sheet/XConsolidatable.idl
index ba02e0741480..8d8b7426f768 100644
--- a/offapi/com/sun/star/sheet/XConsolidatable.idl
+++ b/offapi/com/sun/star/sheet/XConsolidatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XConsolidatable_idl__
#define __com_sun_star_sheet_XConsolidatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
index e23069c57a84..25d981b81f70 100644
--- a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#define __com_sun_star_sheet_XConsolidationDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELink.idl b/offapi/com/sun/star/sheet/XDDELink.idl
index 3f2a71ed4cbd..b23bbd6ad6ce 100644
--- a/offapi/com/sun/star/sheet/XDDELink.idl
+++ b/offapi/com/sun/star/sheet/XDDELink.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDDELink_idl__
#define __com_sun_star_sheet_XDDELink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELinkResults.idl b/offapi/com/sun/star/sheet/XDDELinkResults.idl
index b0ca1afd5205..aaab7f4f83bf 100644
--- a/offapi/com/sun/star/sheet/XDDELinkResults.idl
+++ b/offapi/com/sun/star/sheet/XDDELinkResults.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
#define __com_sun_star_sheet_XDDELinkResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELinks.idl b/offapi/com/sun/star/sheet/XDDELinks.idl
index 6863a4432c8c..59c9cccb7e03 100644
--- a/offapi/com/sun/star/sheet/XDDELinks.idl
+++ b/offapi/com/sun/star/sheet/XDDELinks.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDDELinks_idl__
#define __com_sun_star_sheet_XDDELinks_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
#include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DDELinkMode_idl__
#include <com/sun/star/sheet/DDELinkMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
index 06d74a921077..26fa3f7dc2fe 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
#define __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
index ab86bf29e05a..e3466071c838 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#define __com_sun_star_sheet_XDataPilotDescriptor_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotField.idl b/offapi/com/sun/star/sheet/XDataPilotField.idl
index 43f98d55f029..a56745f98179 100644
--- a/offapi/com/sun/star/sheet/XDataPilotField.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#define __com_sun_star_sheet_XDataPilotField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index 23e5f8a8dc35..3da01a1b4d59 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
#define __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
index b8f51d27cfcd..d9701b077d9a 100644
--- a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
#define __com_sun_star_sheet_XDataPilotMemberResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_MemberResult_idl__
#include <com/sun/star/sheet/MemberResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotResults.idl b/offapi/com/sun/star/sheet/XDataPilotResults.idl
index 38e4c2ec6886..ec6950670d17 100644
--- a/offapi/com/sun/star/sheet/XDataPilotResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotResults.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
#define __com_sun_star_sheet_XDataPilotResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataResult_idl__
#include <com/sun/star/sheet/DataResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable.idl b/offapi/com/sun/star/sheet/XDataPilotTable.idl
index 00aae3780bd9..2a6c4e66bb6b 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#define __com_sun_star_sheet_XDataPilotTable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable2.idl b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
index a0fbd5934e8d..ed6dde8a1426 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable2.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
@@ -28,30 +28,12 @@
#ifndef __com_sun_star_sheet_XDataPilotTable2_idl__
#define __com_sun_star_sheet_XDataPilotTable2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotOutputRangeType_idl__
#include <com/sun/star/sheet/DataPilotOutputRangeType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
#include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
#include <com/sun/star/sheet/DataPilotTablePositionData.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/sheet/XDataPilotTables.idl b/offapi/com/sun/star/sheet/XDataPilotTables.idl
index f4706cdb223c..77e4daf23043 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTables.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#define __com_sun_star_sheet_XDataPilotTables_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
index 1df209f6d669..285d03b4dbe8 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
#define __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index 9826ab8278e6..608a652112eb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
#define __com_sun_star_sheet_XDatabaseRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDatabaseRanges.idl b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
index 1794f3c7eb42..b986915a71cb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#define __com_sun_star_sheet_XDatabaseRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
index 309fdee4c522..50576e87d039 100644
--- a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
#define __com_sun_star_sheet_XDimensionsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDocumentAuditing.idl b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
index 25a82ffb6970..da8da2723005 100644
--- a/offapi/com/sun/star/sheet/XDocumentAuditing.idl
+++ b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
#define __com_sun_star_sheet_XDocumentAuditing_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index b0cb6e212050..58b7ff5c9d48 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDrillDownDataSupplier_idl__
#define __com_sun_star_sheet_XDrillDownDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
#include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
index 16de0542a669..809b05371ea2 100644
--- a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
#define __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
#include <com/sun/star/awt/XEnhancedMouseClickHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XExternalSheetName.idl b/offapi/com/sun/star/sheet/XExternalSheetName.idl
index dd0cc73c67ec..eb5d3f692a99 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetName.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetName.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
#define __com_sun_star_sheet_XExternalSheetName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
index b00ccb8158c6..0d416d6f1190 100644
--- a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
+++ b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XFillAcrossSheet_idl__
#define __com_sun_star_sheet_XFillAcrossSheet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index b20fdf4e2889..9f3db26ad8ad 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
#define __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaQuery.idl b/offapi/com/sun/star/sheet/XFormulaQuery.idl
index 3c5ca0b0eb23..9b4dd11976a9 100644
--- a/offapi/com/sun/star/sheet/XFormulaQuery.idl
+++ b/offapi/com/sun/star/sheet/XFormulaQuery.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
#define __com_sun_star_sheet_XFormulaQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 5edfe0b9840d..cc2d42c17091 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaTokens_idl__
#define __com_sun_star_sheet_XFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFunctionAccess.idl b/offapi/com/sun/star/sheet/XFunctionAccess.idl
index c12401421b35..a5ce77a21e22 100644
--- a/offapi/com/sun/star/sheet/XFunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/XFunctionAccess.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
#define __com_sun_star_sheet_XFunctionAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
index 6346de137820..944a512cdc07 100644
--- a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
#define __com_sun_star_sheet_XFunctionDescriptions_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XGoalSeek.idl b/offapi/com/sun/star/sheet/XGoalSeek.idl
index a6e627574f88..cbe74b24d9d2 100644
--- a/offapi/com/sun/star/sheet/XGoalSeek.idl
+++ b/offapi/com/sun/star/sheet/XGoalSeek.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XGoalSeek_idl__
#define __com_sun_star_sheet_XGoalSeek_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GoalResult_idl__
#include <com/sun/star/sheet/GoalResult.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
index 6b491fadabf0..61a66d169852 100644
--- a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#define __com_sun_star_sheet_XHeaderFooterContent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
index 8b96a2888a04..9695363931c7 100644
--- a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
#define __com_sun_star_sheet_XHierarchiesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLabelRange.idl b/offapi/com/sun/star/sheet/XLabelRange.idl
index 0fc837e8d244..b12a4cb078b4 100644
--- a/offapi/com/sun/star/sheet/XLabelRange.idl
+++ b/offapi/com/sun/star/sheet/XLabelRange.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLabelRange_idl__
#define __com_sun_star_sheet_XLabelRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLabelRanges.idl b/offapi/com/sun/star/sheet/XLabelRanges.idl
index b1cf0aaeac09..a33d75cf9b36 100644
--- a/offapi/com/sun/star/sheet/XLabelRanges.idl
+++ b/offapi/com/sun/star/sheet/XLabelRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#define __com_sun_star_sheet_XLabelRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLevelsSupplier.idl b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
index ec867a5ecf94..e0941d2cbe5c 100644
--- a/offapi/com/sun/star/sheet/XLevelsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
#define __com_sun_star_sheet_XLevelsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMembersSupplier.idl b/offapi/com/sun/star/sheet/XMembersSupplier.idl
index 44c9669bc247..5bd7dde0f01e 100644
--- a/offapi/com/sun/star/sheet/XMembersSupplier.idl
+++ b/offapi/com/sun/star/sheet/XMembersSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
#define __com_sun_star_sheet_XMembersSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index eb6ade5c3883..7cf55b7b1f15 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XMultiFormulaTokens_idl__
#define __com_sun_star_sheet_XMultiFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMultipleOperation.idl b/offapi/com/sun/star/sheet/XMultipleOperation.idl
index c0ba09d28674..550f0d41ac89 100644
--- a/offapi/com/sun/star/sheet/XMultipleOperation.idl
+++ b/offapi/com/sun/star/sheet/XMultipleOperation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
#define __com_sun_star_sheet_XMultipleOperation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableOperationMode_idl__
#include <com/sun/star/sheet/TableOperationMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XNamedRange.idl b/offapi/com/sun/star/sheet/XNamedRange.idl
index 678594c41d15..34312e316e3e 100644
--- a/offapi/com/sun/star/sheet/XNamedRange.idl
+++ b/offapi/com/sun/star/sheet/XNamedRange.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XNamedRange_idl__
#define __com_sun_star_sheet_XNamedRange_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XNamedRanges.idl b/offapi/com/sun/star/sheet/XNamedRanges.idl
index 36fb40485ce6..a1919ed7f32c 100644
--- a/offapi/com/sun/star/sheet/XNamedRanges.idl
+++ b/offapi/com/sun/star/sheet/XNamedRanges.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#define __com_sun_star_sheet_XNamedRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Border_idl__
#include <com/sun/star/sheet/Border.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XPrintAreas.idl b/offapi/com/sun/star/sheet/XPrintAreas.idl
index 77078c687955..d0008b9c4139 100644
--- a/offapi/com/sun/star/sheet/XPrintAreas.idl
+++ b/offapi/com/sun/star/sheet/XPrintAreas.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XPrintAreas_idl__
#define __com_sun_star_sheet_XPrintAreas_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelection.idl b/offapi/com/sun/star/sheet/XRangeSelection.idl
index e5a43d211a15..b1cda9c73961 100644
--- a/offapi/com/sun/star/sheet/XRangeSelection.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelection_idl__
#define __com_sun_star_sheet_XRangeSelection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
index b67d55f72728..6c9a99403ce4 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
#define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
index 41e9755127e2..7b1072bb591b 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__
#define __com_sun_star_sheet_XRangeSelectionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRecentFunctions.idl b/offapi/com/sun/star/sheet/XRecentFunctions.idl
index 91a3436f9bb9..40b7c91bff81 100644
--- a/offapi/com/sun/star/sheet/XRecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/XRecentFunctions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
#define __com_sun_star_sheet_XRecentFunctions_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XResultListener.idl b/offapi/com/sun/star/sheet/XResultListener.idl
index 7f72f0fd0a35..5c80e01cf28d 100644
--- a/offapi/com/sun/star/sheet/XResultListener.idl
+++ b/offapi/com/sun/star/sheet/XResultListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XResultListener_idl__
#define __com_sun_star_sheet_XResultListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ResultEvent_idl__
#include <com/sun/star/sheet/ResultEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenario.idl b/offapi/com/sun/star/sheet/XScenario.idl
index 4ff1ad532d6a..9904e3a4f830 100644
--- a/offapi/com/sun/star/sheet/XScenario.idl
+++ b/offapi/com/sun/star/sheet/XScenario.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XScenario_idl__
#define __com_sun_star_sheet_XScenario_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
index e61f6103e3b9..c2d3e850699c 100644
--- a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
+++ b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
#define __com_sun_star_sheet_XScenarioEnhanced_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarios.idl b/offapi/com/sun/star/sheet/XScenarios.idl
index d294bdf72b42..c2318fde074d 100644
--- a/offapi/com/sun/star/sheet/XScenarios.idl
+++ b/offapi/com/sun/star/sheet/XScenarios.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XScenarios_idl__
#define __com_sun_star_sheet_XScenarios_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenariosSupplier.idl b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
index f04770fe08aa..6187a03b7505 100644
--- a/offapi/com/sun/star/sheet/XScenariosSupplier.idl
+++ b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#define __com_sun_star_sheet_XScenariosSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarios_idl__
#include <com/sun/star/sheet/XScenarios.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotation.idl b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
index a999cf8f32b8..08dcf3473150 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotation.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#define __com_sun_star_sheet_XSheetAnnotation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
index e53477080bea..580988fbf6a2 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
#define __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
index 5075cc2f52b4..17c634af3802 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
#define __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotations.idl b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
index d4af276060f4..5dd306679398 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotations.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#define __com_sun_star_sheet_XSheetAnnotations_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
index 9b696060a977..d565c651ad77 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
#define __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAuditing.idl b/offapi/com/sun/star/sheet/XSheetAuditing.idl
index 43342f5a6f6b..27b22679292b 100644
--- a/offapi/com/sun/star/sheet/XSheetAuditing.idl
+++ b/offapi/com/sun/star/sheet/XSheetAuditing.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
#define __com_sun_star_sheet_XSheetAuditing_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellCursor.idl b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
index 3141231437cd..9be7548ed8b7 100644
--- a/offapi/com/sun/star/sheet/XSheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
#define __com_sun_star_sheet_XSheetCellCursor_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRange.idl b/offapi/com/sun/star/sheet/XSheetCellRange.idl
index f025a44e3e25..adb62b1f720a 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#define __com_sun_star_sheet_XSheetCellRange_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
index b063b2ed3f95..c0f3bcf9cc84 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
#define __com_sun_star_sheet_XSheetCellRangeContainer_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRanges.idl b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
index 7b87269d779f..9f283dc0678d 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#define __com_sun_star_sheet_XSheetCellRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCondition.idl b/offapi/com/sun/star/sheet/XSheetCondition.idl
index 3fc4635f9b4a..46aef18e092c 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#define __com_sun_star_sheet_XSheetCondition_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator_idl__
#include <com/sun/star/sheet/ConditionOperator.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCondition2.idl b/offapi/com/sun/star/sheet/XSheetCondition2.idl
index 3c78f16e57c7..d03a79f0c964 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition2.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition2.idl
@@ -29,21 +29,10 @@
#ifndef __com_sun_star_sheet_XSheetCondition2_idl__
#define __com_sun_star_sheet_XSheetCondition2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator2_idl__
#include <com/sun/star/sheet/ConditionOperator2.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
index 8e8b10af5e14..c12b6a80b0a7 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#define __com_sun_star_sheet_XSheetConditionalEntries_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
index 2ecc635393b6..e09afd1fe85b 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
#define __com_sun_star_sheet_XSheetConditionalEntry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index b40437ec0fac..676e263501e8 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
#define __com_sun_star_sheet_XSheetFilterable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
index 591e9b18ed72..5df55bb8ed1f 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
#define __com_sun_star_sheet_XSheetFilterableEx_idl__
-#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
#include <com/sun/star/sheet/XSheetFilterable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetLinkable.idl b/offapi/com/sun/star/sheet/XSheetLinkable.idl
index 159176dce9d3..f13d34e2281a 100644
--- a/offapi/com/sun/star/sheet/XSheetLinkable.idl
+++ b/offapi/com/sun/star/sheet/XSheetLinkable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
#define __com_sun_star_sheet_XSheetLinkable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetLinkMode_idl__
#include <com/sun/star/sheet/SheetLinkMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetOperation.idl b/offapi/com/sun/star/sheet/XSheetOperation.idl
index a547cfa66e91..32a8f1f86868 100644
--- a/offapi/com/sun/star/sheet/XSheetOperation.idl
+++ b/offapi/com/sun/star/sheet/XSheetOperation.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#define __com_sun_star_sheet_XSheetOperation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetOutline.idl b/offapi/com/sun/star/sheet/XSheetOutline.idl
index 0f3de869d980..85466ed15180 100644
--- a/offapi/com/sun/star/sheet/XSheetOutline.idl
+++ b/offapi/com/sun/star/sheet/XSheetOutline.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetOutline_idl__
#define __com_sun_star_sheet_XSheetOutline_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
#include <com/sun/star/table/TableOrientation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetPageBreak.idl b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
index 7d590f18eac0..f948cdbb541e 100644
--- a/offapi/com/sun/star/sheet/XSheetPageBreak.idl
+++ b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
#define __com_sun_star_sheet_XSheetPageBreak_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TablePageBreakData_idl__
#include <com/sun/star/sheet/TablePageBreakData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetPastable.idl b/offapi/com/sun/star/sheet/XSheetPastable.idl
index db2053f83273..3b0c6b812cae 100644
--- a/offapi/com/sun/star/sheet/XSheetPastable.idl
+++ b/offapi/com/sun/star/sheet/XSheetPastable.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XSheetPastable_idl__
#define __com_sun_star_sheet_XSheetPastable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_PasteOperation_idl__
#include <com/sun/star/sheet/PasteOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
#include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSolver.idl b/offapi/com/sun/star/sheet/XSolver.idl
index aaf54ddb7586..26a28e40fcae 100644
--- a/offapi/com/sun/star/sheet/XSolver.idl
+++ b/offapi/com/sun/star/sheet/XSolver.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSolver_idl__
#define __com_sun_star_sheet_XSolver_idl__
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraint_idl__
#include <com/sun/star/sheet/SolverConstraint.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSolverDescription.idl b/offapi/com/sun/star/sheet/XSolverDescription.idl
index 0efe1e202e94..808a6d6f0bda 100644
--- a/offapi/com/sun/star/sheet/XSolverDescription.idl
+++ b/offapi/com/sun/star/sheet/XSolverDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSolverDescription_idl__
#define __com_sun_star_sheet_XSolverDescription_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheet.idl b/offapi/com/sun/star/sheet/XSpreadsheet.idl
index 3f7628ad5a4a..10b35b31d6f6 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheet.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#define __com_sun_star_sheet_XSpreadsheet_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
index a60248d22b75..8b49166999ed 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#define __com_sun_star_sheet_XSpreadsheetDocument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetView.idl b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
index baefdb2359c7..92926e9e1f4c 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
#define __com_sun_star_sheet_XSpreadsheetView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets.idl b/offapi/com/sun/star/sheet/XSpreadsheets.idl
index f50157768667..293dd45ffb15 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#define __com_sun_star_sheet_XSpreadsheets_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
index c1c1524a14a5..4ca801521920 100644
--- a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
#define __com_sun_star_sheet_XSubTotalCalculatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
index 2a2d0afe1293..469083172320 100644
--- a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#define __com_sun_star_sheet_XSubTotalDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalField.idl b/offapi/com/sun/star/sheet/XSubTotalField.idl
index 3af87e72df3c..5b12e0944358 100644
--- a/offapi/com/sun/star/sheet/XSubTotalField.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalField_idl__
#define __com_sun_star_sheet_XSubTotalField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
index 73e758af6539..39d3e08bd522 100644
--- a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
#define __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
index 528b55c07a5c..4d7cf0c1de8c 100644
--- a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
+++ b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
#define __com_sun_star_sheet_XUsedAreaCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewFreezable.idl b/offapi/com/sun/star/sheet/XViewFreezable.idl
index 46464036e704..ffa8a0249435 100644
--- a/offapi/com/sun/star/sheet/XViewFreezable.idl
+++ b/offapi/com/sun/star/sheet/XViewFreezable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XViewFreezable_idl__
#define __com_sun_star_sheet_XViewFreezable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPane.idl b/offapi/com/sun/star/sheet/XViewPane.idl
index 41f441e6a803..46a115fe7f5c 100644
--- a/offapi/com/sun/star/sheet/XViewPane.idl
+++ b/offapi/com/sun/star/sheet/XViewPane.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sheet_XViewPane_idl__
#define __com_sun_star_sheet_XViewPane_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
index 130498695c6e..79e99faeb42c 100644
--- a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XViewPanesSupplier_idl__
#define __com_sun_star_sheet_XViewPanesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewSplitable.idl b/offapi/com/sun/star/sheet/XViewSplitable.idl
index d5145addb9ee..0b0d1aa073d4 100644
--- a/offapi/com/sun/star/sheet/XViewSplitable.idl
+++ b/offapi/com/sun/star/sheet/XViewSplitable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XViewSplitable_idl__
#define __com_sun_star_sheet_XViewSplitable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XVolatileResult.idl b/offapi/com/sun/star/sheet/XVolatileResult.idl
index 9378e09472f0..665e546367d5 100644
--- a/offapi/com/sun/star/sheet/XVolatileResult.idl
+++ b/offapi/com/sun/star/sheet/XVolatileResult.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XVolatileResult_idl__
#define __com_sun_star_sheet_XVolatileResult_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XResultListener_idl__
#include <com/sun/star/sheet/XResultListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/smarttags/XSmartTagAction.idl b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
index 74ee62ffab11..5a591bff6d40 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagAction.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_smarttags_XSmartTagAction_idl__
#define __com_sun_star_smarttags_XSmartTagAction_idl__
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
#include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
index 526d1bcabaa3..481bbf86bab0 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_smarttags_XSmartTagRecognizer_idl__
#define __com_sun_star_smarttags_XSmartTagRecognizer_idl__
-#ifndef __com_sun_star_uno_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
#include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
-
-#ifndef __com_sun_star_smarttags_SmartTagRecognizerMode_idl__
#include <com/sun/star/smarttags/SmartTagRecognizerMode.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
#include <com/sun/star/text/XTextMarkup.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/CellStyle.idl b/offapi/com/sun/star/style/CellStyle.idl
index d0bb6ac2ce2c..4410d37caf03 100644
--- a/offapi/com/sun/star/style/CellStyle.idl
+++ b/offapi/com/sun/star/style/CellStyle.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_style_CellStyle_idl__
#define __com_sun_star_style_CellStyle_idl__
-#ifndef __com_sun_star_style_Style_idl__
#include <com/sun/star/style/Style.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterProperties.idl b/offapi/com/sun/star/style/CharacterProperties.idl
index d2ab956c348f..a5788c0005f5 100644
--- a/offapi/com/sun/star/style/CharacterProperties.idl
+++ b/offapi/com/sun/star/style/CharacterProperties.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_style_CharacterProperties_idl__
#define __com_sun_star_style_CharacterProperties_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
index 56d54ef7545a..9ae2c02af330 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#define __com_sun_star_style_CharacterPropertiesAsian_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
index 12f7dab0d4a4..db8d513ca16e 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
#define __com_sun_star_style_CharacterProperties_Complex_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterStyle.idl b/offapi/com/sun/star/style/CharacterStyle.idl
index f5d8a6ff08ea..f56efd01d220 100644
--- a/offapi/com/sun/star/style/CharacterStyle.idl
+++ b/offapi/com/sun/star/style/CharacterStyle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_style_CharacterStyle_idl__
#define __com_sun_star_style_CharacterStyle_idl__
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
#include <com/sun/star/style/Style.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/NumberingAlignment.idl b/offapi/com/sun/star/style/NumberingAlignment.idl
index 8792b04101a5..1b75be91b8d4 100644
--- a/offapi/com/sun/star/style/NumberingAlignment.idl
+++ b/offapi/com/sun/star/style/NumberingAlignment.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_style_NumberingAlignment_idl__
#define __com_sun_star_style_NumberingAlignment_idl__
-#ifndef __com_sun_star_style_HorizontalAlignment_idl__
#include <com/sun/star/style/HorizontalAlignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/NumberingRule.idl b/offapi/com/sun/star/style/NumberingRule.idl
index 72555e5d1913..bfcfd0f7ac69 100644
--- a/offapi/com/sun/star/style/NumberingRule.idl
+++ b/offapi/com/sun/star/style/NumberingRule.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_NumberingRule_idl__
#define __com_sun_star_style_NumberingRule_idl__
-#ifndef __com_sun_star_style_NumberingAlignment_idl__
#include <com/sun/star/style/NumberingAlignment.idl>
-#endif
-#ifndef __com_sun_star_style_NumberingLevel_idl__
#include <com/sun/star/style/NumberingLevel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index 4476ff711ff7..3ebacf25e909 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_style_PageProperties_idl__
#define __com_sun_star_style_PageProperties_idl__
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
#include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextColumns_idl__
#include <com/sun/star/text/XTextColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode2_idl__
#include <com/sun/star/text/WritingMode2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/PageStyle.idl b/offapi/com/sun/star/style/PageStyle.idl
index 9810198a3257..b80991031111 100644
--- a/offapi/com/sun/star/style/PageStyle.idl
+++ b/offapi/com/sun/star/style/PageStyle.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_style_PageStyle_idl__
#define __com_sun_star_style_PageStyle_idl__
-#ifndef __com_sun_star_style_Style_idl__
#include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageProperties_idl__
#include <com/sun/star/style/PageProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index 57bbdee9a7ac..f177f725cc37 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -27,45 +27,17 @@
#ifndef __com_sun_star_style_ParagraphProperties_idl__
#define __com_sun_star_style_ParagraphProperties_idl__
-#ifndef __com_sun_star_style_ParagraphAdjust_idl__
#include <com/sun/star/style/ParagraphAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_LineSpacing_idl__
#include <com/sun/star/style/LineSpacing.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_style_TabStop_idl__
#include <com/sun/star/style/TabStop.idl>
-#endif
-
-#ifndef __com_sun_star_style_DropCapFormat_idl__
#include <com/sun/star/style/DropCapFormat.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
#include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/ParagraphStyle.idl b/offapi/com/sun/star/style/ParagraphStyle.idl
index e0e192b9826d..c61b08ffb709 100644
--- a/offapi/com/sun/star/style/ParagraphStyle.idl
+++ b/offapi/com/sun/star/style/ParagraphStyle.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_style_ParagraphStyle_idl__
#define __com_sun_star_style_ParagraphStyle_idl__
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
#include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl
index d24c2cd42636..78fba0e855bc 100644
--- a/offapi/com/sun/star/style/Style.idl
+++ b/offapi/com/sun/star/style/Style.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_style_Style_idl__
#define __com_sun_star_style_Style_idl__
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.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_beans_XMultiPropertyStates_idl__
#include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/StyleFamilies.idl b/offapi/com/sun/star/style/StyleFamilies.idl
index 5dd1afad2d39..375c6a370c8f 100644
--- a/offapi/com/sun/star/style/StyleFamilies.idl
+++ b/offapi/com/sun/star/style/StyleFamilies.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_StyleFamilies_idl__
#define __com_sun_star_style_StyleFamilies_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/StyleFamily.idl b/offapi/com/sun/star/style/StyleFamily.idl
index ae4e1be0cad7..36c276e4bfcb 100644
--- a/offapi/com/sun/star/style/StyleFamily.idl
+++ b/offapi/com/sun/star/style/StyleFamily.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_StyleFamily_idl__
#define __com_sun_star_style_StyleFamily_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/TabStop.idl b/offapi/com/sun/star/style/TabStop.idl
index 37a8eb47e2d7..ca3d1c3b829e 100644
--- a/offapi/com/sun/star/style/TabStop.idl
+++ b/offapi/com/sun/star/style/TabStop.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_style_TabStop_idl__
#define __com_sun_star_style_TabStop_idl__
-#ifndef __com_sun_star_style_TabAlign_idl__
#include <com/sun/star/style/TabAlign.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XAutoStyle.idl b/offapi/com/sun/star/style/XAutoStyle.idl
index 41d40ce80af7..d188e387a9b4 100644
--- a/offapi/com/sun/star/style/XAutoStyle.idl
+++ b/offapi/com/sun/star/style/XAutoStyle.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_style_XAutoStyle_idl__
#define __com_sun_star_style_XAutoStyle_idl__
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.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_beans_XMultiPropertyStates_idl__
#include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
diff --git a/offapi/com/sun/star/style/XAutoStyleFamily.idl b/offapi/com/sun/star/style/XAutoStyleFamily.idl
index 9a448b6392a9..bf7c403d6af0 100644
--- a/offapi/com/sun/star/style/XAutoStyleFamily.idl
+++ b/offapi/com/sun/star/style/XAutoStyleFamily.idl
@@ -26,16 +26,10 @@
************************************************************************/
#ifndef __com_sun_star_style_XAutoStyleFamily_idl__
#define __com_sun_star_style_XAutoStyleFamily_idl__
-#ifndef __com_sun_star_style_XAutoStyle_idl__
#include <com/sun/star/style/XAutoStyle.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XAutoStyles.idl b/offapi/com/sun/star/style/XAutoStyles.idl
index 4293ab6cab65..29d2dc4dc8e1 100644
--- a/offapi/com/sun/star/style/XAutoStyles.idl
+++ b/offapi/com/sun/star/style/XAutoStyles.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_XAutoStyles_idl__
#define __com_sun_star_style_XAutoStyles_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XAutoStylesSupplier.idl b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
index 2c4a3dc4f724..86238bfb2a33 100644
--- a/offapi/com/sun/star/style/XAutoStylesSupplier.idl
+++ b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_style_XAutoStylesSupplier_idl__
#define __com_sun_star_style_XAutoStylesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_style_XAutoStyles_idl__
#include <com/sun/star/style/XAutoStyles.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XDefaultsSupplier.idl b/offapi/com/sun/star/style/XDefaultsSupplier.idl
index 2ece9ece2a31..db7e166486e0 100644
--- a/offapi/com/sun/star/style/XDefaultsSupplier.idl
+++ b/offapi/com/sun/star/style/XDefaultsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_XDefaultsSupplier_idl__
#define __com_sun_star_style_XDefaultsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XStyle.idl b/offapi/com/sun/star/style/XStyle.idl
index 0117bf5167a5..a50a483b931d 100644
--- a/offapi/com/sun/star/style/XStyle.idl
+++ b/offapi/com/sun/star/style/XStyle.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_XStyle_idl__
#define __com_sun_star_style_XStyle_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleCondition.idl b/offapi/com/sun/star/style/XStyleCondition.idl
index e74f3f01a2df..67226eb8843d 100644
--- a/offapi/com/sun/star/style/XStyleCondition.idl
+++ b/offapi/com/sun/star/style/XStyleCondition.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_style_XStyleCondition_idl__
#define __com_sun_star_style_XStyleCondition_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
index 8d26373ce6a6..ebaa9e25f6cb 100644
--- a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#define __com_sun_star_style_XStyleFamiliesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl b/offapi/com/sun/star/style/XStyleLoader.idl
index 5fbc1d6588a4..387bde6b6e1b 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_style_XStyleLoader_idl__
#define __com_sun_star_style_XStyleLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index 059da696ac83..dd5a480c8d1e 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync_XSVGPrinter_idl__
#define __com_sun_star_sync_XSVGPrinter_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index d4ff549a8c53..7066773c5dd3 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync_XSVGWriter_idl__
#define __com_sun_star_sync_XSVGWriter_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync/SyncCollector.idl b/offapi/com/sun/star/sync/SyncCollector.idl
index b174c87052ed..b984cb7319a1 100644
--- a/offapi/com/sun/star/sync/SyncCollector.idl
+++ b/offapi/com/sun/star/sync/SyncCollector.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync_SyncCollector_idl__
#define __com_sun_star_sync_SyncCollector_idl__
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
#include <com/sun/star/sync/XSyncCollector.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
index b5400ee3a446..ab8c7804d0ee 100644
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ b/offapi/com/sun/star/sync/SyncInfo.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync_SyncInfo_idl__
#define __com_sun_star_sync_SyncInfo_idl__
-#ifndef __com_sun_star_sync_SyncScheme_idl__
#include <com/sun/star/sync/SyncScheme.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync/Synchronizer.idl b/offapi/com/sun/star/sync/Synchronizer.idl
index fd705bae00f1..df40661e0c0a 100644
--- a/offapi/com/sun/star/sync/Synchronizer.idl
+++ b/offapi/com/sun/star/sync/Synchronizer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync_Synchronizer_idl__
#define __com_sun_star_sync_Synchronizer_idl__
-#ifndef __com_sun_star_sync_XSynchronizer_idl__
#include <com/sun/star/sync/XSynchronizer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync/XSyncCollector.idl b/offapi/com/sun/star/sync/XSyncCollector.idl
index 08dcf21c5ae0..367f18664697 100644
--- a/offapi/com/sun/star/sync/XSyncCollector.idl
+++ b/offapi/com/sun/star/sync/XSyncCollector.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_sync_XSyncCollector_idl__
#define __com_sun_star_sync_XSyncCollector_idl__
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
#include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncScheme_idl__
#include <com/sun/star/sync/SyncScheme.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
#include <com/sun/star/sync/SyncInfo.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncElement_idl__
#include <com/sun/star/sync/SyncElement.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync/XSynchronizer.idl b/offapi/com/sun/star/sync/XSynchronizer.idl
index 906a0cb78607..d2df6b683d3e 100644
--- a/offapi/com/sun/star/sync/XSynchronizer.idl
+++ b/offapi/com/sun/star/sync/XSynchronizer.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sync_XSynchronizer_idl__
#define __com_sun_star_sync_XSynchronizer_idl__
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
#include <com/sun/star/sync/XSyncCollector.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
#include <com/sun/star/sync/SyncInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sync2/BadPartnershipException.idl b/offapi/com/sun/star/sync2/BadPartnershipException.idl
index 1fcfad42f633..2155275552b4 100644
--- a/offapi/com/sun/star/sync2/BadPartnershipException.idl
+++ b/offapi/com/sun/star/sync2/BadPartnershipException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sync2_BadPartnershipException_idl__
#define __com_sun_star_sync2_BadPartnershipException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include "com/sun/star/uno/Exception.idl"
-#endif
module com { module sun { module star { module sync2 {
diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index 826cf2ea4faf..31dd970090d2 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_system_ProxySettings_idl__
#define __com_sun_star_system_ProxySettings_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
index a745ed7a4bc1..da87b40548e1 100644
--- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl
+++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_system_SOffice52ProxySettings_idl__
#define __com_sun_star_system_SOffice52ProxySettings_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
#include <com/sun/star/system/ProxySettings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl
index 7d2ee1833f3a..f850efb8db3d 100644
--- a/offapi/com/sun/star/system/SimpleCommandMail.idl
+++ b/offapi/com/sun/star/system/SimpleCommandMail.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_system_SimpleCommandMail_idl__
#define __com_sun_star_system_SimpleCommandMail_idl__
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
#include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl
index 4fe46be81d0a..373580451f64 100644
--- a/offapi/com/sun/star/system/SimpleSystemMail.idl
+++ b/offapi/com/sun/star/system/SimpleSystemMail.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_system_SimpleSystemMail_idl__
#define __com_sun_star_system_SimpleSystemMail_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl
index 9093afe1f7cb..6bd93d6a9757 100644
--- a/offapi/com/sun/star/system/SystemProxySettings.idl
+++ b/offapi/com/sun/star/system/SystemProxySettings.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_system_SystemProxySettings_idl__
#define __com_sun_star_system_SystemProxySettings_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
#include <com/sun/star/system/ProxySettings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl
index 2440c9c2492b..ef0a0f21d260 100644
--- a/offapi/com/sun/star/system/SystemShellExecute.idl
+++ b/offapi/com/sun/star/system/SystemShellExecute.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_system_SystemShellExecute_idl__
#define __com_sun_star_system_SystemShellExecute_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/SystemShellExecuteException.idl b/offapi/com/sun/star/system/SystemShellExecuteException.idl
index b38dac41f694..1c22e3224f92 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteException.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#define __com_sun_star_system_SystemShellExecuteException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/XProxySettings.idl b/offapi/com/sun/star/system/XProxySettings.idl
index 72c76786ddea..7b1e6a41837d 100644
--- a/offapi/com/sun/star/system/XProxySettings.idl
+++ b/offapi/com/sun/star/system/XProxySettings.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_system_XProxySettings_idl__
#define __com_sun_star_system_XProxySettings_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/XSimpleMailClient.idl b/offapi/com/sun/star/system/XSimpleMailClient.idl
index f768cf67c070..0e92cee08ccc 100644
--- a/offapi/com/sun/star/system/XSimpleMailClient.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClient.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_system_XSimpleMailClient_idl__
#define __com_sun_star_system_XSimpleMailClient_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailMessage_idl__
#include <com/sun/star/system/XSimpleMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_system_SimpleMailClientFlags_idl__
#include <com/sun/star/system/SimpleMailClientFlags.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
index fce041b2892b..ed6ac0109176 100644
--- a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_system_XSimpleMailClientSupplier_idl__
#define __com_sun_star_system_XSimpleMailClientSupplier_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailClient_idl__
#include <com/sun/star/system/XSimpleMailClient.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/XSimpleMailMessage.idl b/offapi/com/sun/star/system/XSimpleMailMessage.idl
index 1c507a561a8d..af08605221b0 100644
--- a/offapi/com/sun/star/system/XSimpleMailMessage.idl
+++ b/offapi/com/sun/star/system/XSimpleMailMessage.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_system_XSimpleMailMessage_idl__
#define __com_sun_star_system_XSimpleMailMessage_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl
index 5d3f5c22c7a9..4440b045cba4 100644
--- a/offapi/com/sun/star/system/XSystemShellExecute.idl
+++ b/offapi/com/sun/star/system/XSystemShellExecute.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_system_XSystemShellExecute_idl__
#define __com_sun_star_system_XSystemShellExecute_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#include <com/sun/star/system/SystemShellExecuteException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index 8f42e9227c3a..27795cde2df2 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 9b425e0ba81f..8113843d5501 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/BorderLine.idl b/offapi/com/sun/star/table/BorderLine.idl
index d5ed94fd0ed1..0344e63ad1ce 100644
--- a/offapi/com/sun/star/table/BorderLine.idl
+++ b/offapi/com/sun/star/table/BorderLine.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_BorderLine_idl__
#define __com_sun_star_table_BorderLine_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/Cell.idl b/offapi/com/sun/star/table/Cell.idl
index 9cd81fb80fce..845a328fd39d 100644
--- a/offapi/com/sun/star/table/Cell.idl
+++ b/offapi/com/sun/star/table/Cell.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_Cell_idl__
#define __com_sun_star_table_Cell_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/CellCursor.idl b/offapi/com/sun/star/table/CellCursor.idl
index 996f1d80e75c..2f1016806ac1 100644
--- a/offapi/com/sun/star/table/CellCursor.idl
+++ b/offapi/com/sun/star/table/CellCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_CellCursor_idl__
#define __com_sun_star_table_CellCursor_idl__
-#ifndef __com_sun_star_table_XCellCursor_idl__
#include <com/sun/star/table/XCellCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index c072cbcbc925..c54f478244f8 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -28,45 +28,16 @@
#ifndef __com_sun_star_table_CellProperties_idl__
#define __com_sun_star_table_CellProperties_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
#include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
#include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
#include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_util_CellProtection_idl__
#include <com/sun/star/util/CellProtection.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
#include <com/sun/star/table/TableBorder.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/CellRange.idl b/offapi/com/sun/star/table/CellRange.idl
index 3b1387f859f3..be521e10fa9c 100644
--- a/offapi/com/sun/star/table/CellRange.idl
+++ b/offapi/com/sun/star/table/CellRange.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_CellRange_idl__
#define __com_sun_star_table_CellRange_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index ab450404acfa..c4e6b1e1312a 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_CellRangeListSource_idl__
#define __com_sun_star_sheet_CellRangeListSource_idl__
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
#include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/CellValueBinding.idl b/offapi/com/sun/star/table/CellValueBinding.idl
index 956481aa597a..573904893615 100644
--- a/offapi/com/sun/star/table/CellValueBinding.idl
+++ b/offapi/com/sun/star/table/CellValueBinding.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_table_CellValueBinding_idl__
#define __com_sun_star_table_CellValueBinding_idl__
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
#include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/ListPositionCellBinding.idl b/offapi/com/sun/star/table/ListPositionCellBinding.idl
index 5058a30d870c..373c42a3de77 100644
--- a/offapi/com/sun/star/table/ListPositionCellBinding.idl
+++ b/offapi/com/sun/star/table/ListPositionCellBinding.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_ListPositionCellBinding_idl__
#define __com_sun_star_table_ListPositionCellBinding_idl__
-#ifndef __com_sun_star_table_CellValueBinding_idl__
#include <com/sun/star/table/CellValueBinding.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/ShadowFormat.idl b/offapi/com/sun/star/table/ShadowFormat.idl
index d88445d4a18d..a52c160b15bd 100644
--- a/offapi/com/sun/star/table/ShadowFormat.idl
+++ b/offapi/com/sun/star/table/ShadowFormat.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_ShadowFormat_idl__
#define __com_sun_star_table_ShadowFormat_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowLocation_idl__
#include <com/sun/star/table/ShadowLocation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableBorder.idl b/offapi/com/sun/star/table/TableBorder.idl
index 8688e6c8a3f0..93478ae8c21a 100644
--- a/offapi/com/sun/star/table/TableBorder.idl
+++ b/offapi/com/sun/star/table/TableBorder.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_TableBorder_idl__
#define __com_sun_star_table_TableBorder_idl__
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableBorderDistances.idl b/offapi/com/sun/star/table/TableBorderDistances.idl
index 86db15d99b64..3078d04fc19d 100644
--- a/offapi/com/sun/star/table/TableBorderDistances.idl
+++ b/offapi/com/sun/star/table/TableBorderDistances.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_TableBorderDistances_idl__
#define __com_sun_star_table_TableBorderDistances_idl__
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableChart.idl b/offapi/com/sun/star/table/TableChart.idl
index c12262019785..22b4d0527a87 100644
--- a/offapi/com/sun/star/table/TableChart.idl
+++ b/offapi/com/sun/star/table/TableChart.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableChart_idl__
#define __com_sun_star_table_TableChart_idl__
-#ifndef __com_sun_star_table_XTableChart_idl__
#include <com/sun/star/table/XTableChart.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
#include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableCharts.idl b/offapi/com/sun/star/table/TableCharts.idl
index f2c646f6233b..d962fcee3150 100644
--- a/offapi/com/sun/star/table/TableCharts.idl
+++ b/offapi/com/sun/star/table/TableCharts.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableCharts_idl__
#define __com_sun_star_table_TableCharts_idl__
-#ifndef __com_sun_star_table_XTableCharts_idl__
#include <com/sun/star/table/XTableCharts.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableChartsEnumeration.idl b/offapi/com/sun/star/table/TableChartsEnumeration.idl
index c29e3abbae46..180215c37a67 100644
--- a/offapi/com/sun/star/table/TableChartsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableChartsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_TableChartsEnumeration_idl__
#define __com_sun_star_table_TableChartsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableColumn.idl b/offapi/com/sun/star/table/TableColumn.idl
index 985cc3f7c401..f655d83a854a 100644
--- a/offapi/com/sun/star/table/TableColumn.idl
+++ b/offapi/com/sun/star/table/TableColumn.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableColumn_idl__
#define __com_sun_star_table_TableColumn_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableColumns.idl b/offapi/com/sun/star/table/TableColumns.idl
index 9a3a32c062a1..6dbaff8283b5 100644
--- a/offapi/com/sun/star/table/TableColumns.idl
+++ b/offapi/com/sun/star/table/TableColumns.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableColumns_idl__
#define __com_sun_star_table_TableColumns_idl__
-#ifndef __com_sun_star_table_XTableColumns_idl__
#include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableColumnsEnumeration.idl b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
index b43bf7d320e6..07187b4560be 100644
--- a/offapi/com/sun/star/table/TableColumnsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_TableColumnsEnumeration_idl__
#define __com_sun_star_table_TableColumnsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableRow.idl b/offapi/com/sun/star/table/TableRow.idl
index f3f87e7258a9..e4db9eaea420 100644
--- a/offapi/com/sun/star/table/TableRow.idl
+++ b/offapi/com/sun/star/table/TableRow.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_TableRow_idl__
#define __com_sun_star_table_TableRow_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableRows.idl b/offapi/com/sun/star/table/TableRows.idl
index dfb7db26c84b..7fe5ea2dca4d 100644
--- a/offapi/com/sun/star/table/TableRows.idl
+++ b/offapi/com/sun/star/table/TableRows.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_TableRows_idl__
#define __com_sun_star_table_TableRows_idl__
-#ifndef __com_sun_star_table_XTableRows_idl__
#include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableRowsEnumeration.idl b/offapi/com/sun/star/table/TableRowsEnumeration.idl
index 1ff0c074bd6f..5c5fed232eb7 100644
--- a/offapi/com/sun/star/table/TableRowsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableRowsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_TableRowsEnumeration_idl__
#define __com_sun_star_table_TableRowsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableSortDescriptor.idl b/offapi/com/sun/star/table/TableSortDescriptor.idl
index 9e2277389be0..ffc2c859cfa3 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableSortDescriptor_idl__
#define __com_sun_star_table_TableSortDescriptor_idl__
-#ifndef __com_sun_star_util_SortDescriptor_idl__
#include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_SortField_idl__
#include <com/sun/star/util/SortField.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
#include <com/sun/star/table/TableOrientation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableSortDescriptor2.idl b/offapi/com/sun/star/table/TableSortDescriptor2.idl
index ff62fa490f18..d092a9ddd027 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor2.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor2.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
#define __com_sun_star_table_TableSortDescriptor2_idl__
-#ifndef __com_sun_star_util_SortDescriptor2_idl__
#include <com/sun/star/util/SortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
#include <com/sun/star/table/TableSortField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/TableSortField.idl b/offapi/com/sun/star/table/TableSortField.idl
index e3f424148ef5..ad0225dc95cd 100644
--- a/offapi/com/sun/star/table/TableSortField.idl
+++ b/offapi/com/sun/star/table/TableSortField.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_table_TableSortField_idl__
#define __com_sun_star_table_TableSortField_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
#include <com/sun/star/table/TableSortFieldType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XAutoFormattable.idl b/offapi/com/sun/star/table/XAutoFormattable.idl
index 113c3a17de0a..4916f1d67770 100644
--- a/offapi/com/sun/star/table/XAutoFormattable.idl
+++ b/offapi/com/sun/star/table/XAutoFormattable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_XAutoFormattable_idl__
#define __com_sun_star_table_XAutoFormattable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XCell.idl b/offapi/com/sun/star/table/XCell.idl
index 0c171809ea24..90145c54b3c1 100644
--- a/offapi/com/sun/star/table/XCell.idl
+++ b/offapi/com/sun/star/table/XCell.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_XCell_idl__
#define __com_sun_star_table_XCell_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellContentType_idl__
#include <com/sun/star/table/CellContentType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XCellCursor.idl b/offapi/com/sun/star/table/XCellCursor.idl
index e2b1a195ed98..ec22b1a89bf3 100644
--- a/offapi/com/sun/star/table/XCellCursor.idl
+++ b/offapi/com/sun/star/table/XCellCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_XCellCursor_idl__
#define __com_sun_star_table_XCellCursor_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XCellRange.idl b/offapi/com/sun/star/table/XCellRange.idl
index 433d1173865f..e12f59116f50 100644
--- a/offapi/com/sun/star/table/XCellRange.idl
+++ b/offapi/com/sun/star/table/XCellRange.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_XCellRange_idl__
#define __com_sun_star_table_XCellRange_idl__
-#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_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XColumnRowRange.idl b/offapi/com/sun/star/table/XColumnRowRange.idl
index b72e583495d5..6c452b0f7e5d 100644
--- a/offapi/com/sun/star/table/XColumnRowRange.idl
+++ b/offapi/com/sun/star/table/XColumnRowRange.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_XColumnRowRange_idl__
#define __com_sun_star_table_XColumnRowRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableColumns_idl__
#include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableRows_idl__
#include <com/sun/star/table/XTableRows.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XMergeableCell.idl b/offapi/com/sun/star/table/XMergeableCell.idl
index 6f1158f4a80f..829929c3c2a7 100644
--- a/offapi/com/sun/star/table/XMergeableCell.idl
+++ b/offapi/com/sun/star/table/XMergeableCell.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_XMergeableCell_idl__
#define __com_sun_star_table_XMergeableCell_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XMergeableCellRange.idl b/offapi/com/sun/star/table/XMergeableCellRange.idl
index 38052f482b31..bb8fa2b30b4d 100644
--- a/offapi/com/sun/star/table/XMergeableCellRange.idl
+++ b/offapi/com/sun/star/table/XMergeableCellRange.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_table_XMergeableCellRange_idl__
#define __com_sun_star_table_XMergeableCellRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTable.idl b/offapi/com/sun/star/table/XTable.idl
index 51e33324a797..fd30489cd957 100644
--- a/offapi/com/sun/star/table/XTable.idl
+++ b/offapi/com/sun/star/table/XTable.idl
@@ -28,41 +28,15 @@
#ifndef __com_sun_star_table_XTable_idl__
#define __com_sun_star_table_XTable_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
#include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellCursor_idl__
#include <com/sun/star/table/XCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__
#include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTableChart.idl b/offapi/com/sun/star/table/XTableChart.idl
index 745efea0e973..de0a1ab1e032 100644
--- a/offapi/com/sun/star/table/XTableChart.idl
+++ b/offapi/com/sun/star/table/XTableChart.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_XTableChart_idl__
#define __com_sun_star_table_XTableChart_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTableCharts.idl b/offapi/com/sun/star/table/XTableCharts.idl
index 6e7a5ea679bc..3b49110f996c 100644
--- a/offapi/com/sun/star/table/XTableCharts.idl
+++ b/offapi/com/sun/star/table/XTableCharts.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_XTableCharts_idl__
#define __com_sun_star_table_XTableCharts_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTableChartsSupplier.idl b/offapi/com/sun/star/table/XTableChartsSupplier.idl
index 351557fbf1a9..462acc14e965 100644
--- a/offapi/com/sun/star/table/XTableChartsSupplier.idl
+++ b/offapi/com/sun/star/table/XTableChartsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_XTableChartsSupplier_idl__
#define __com_sun_star_table_XTableChartsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableCharts_idl__
#include <com/sun/star/table/XTableCharts.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTableColumns.idl b/offapi/com/sun/star/table/XTableColumns.idl
index a6a81b49f96a..75915dc45f23 100644
--- a/offapi/com/sun/star/table/XTableColumns.idl
+++ b/offapi/com/sun/star/table/XTableColumns.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_XTableColumns_idl__
#define __com_sun_star_table_XTableColumns_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/table/XTableRows.idl b/offapi/com/sun/star/table/XTableRows.idl
index bd05abfc2a8f..f518bf8849f3 100644
--- a/offapi/com/sun/star/table/XTableRows.idl
+++ b/offapi/com/sun/star/table/XTableRows.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_table_XTableRows_idl__
#define __com_sun_star_table_XTableRows_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/AsyncJob.idl b/offapi/com/sun/star/task/AsyncJob.idl
index eed753549b75..56e676ca01c8 100644
--- a/offapi/com/sun/star/task/AsyncJob.idl
+++ b/offapi/com/sun/star/task/AsyncJob.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_task_AsyncJob_idl__
#define __com_sun_star_task_AsyncJob_idl__
-#ifndef __com_sun_star_task_XAsyncJob_idl__
#include <com/sun/star/task/XAsyncJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
index fdd98037d6b3..25344b095946 100644
--- a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
+++ b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#define __com_sun_star_task_ClassifiedInteractionRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_task_InteractionClassification_idl__
#include <com/sun/star/task/InteractionClassification.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 1d453e41aa29..68d026ebb444 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_task_DocumentMSPasswordRequest_idl__
#define __com_sun_star_task_DocumentMSPasswordRequest_idl__
-#ifndef __com_sun_star_task_PasswordRequest_idl__
#include <com/sun/star/task/PasswordRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index 40bdff4dd343..ad5b39117467 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_DocumentPasswordRequest_idl__
#define __com_sun_star_task_DocumentPasswordRequest_idl__
-#ifndef __com_sun_star_task_PasswordRequest_idl__
#include <com/sun/star/task/PasswordRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 93b8aaa67d1a..4f90c9cea1ce 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_ErrorCodeIOException_idl__
#define __com_sun_star_task_ErrorCodeIOException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/ErrorCodeRequest.idl b/offapi/com/sun/star/task/ErrorCodeRequest.idl
index 2cd4575f16bc..bbaf0cd74ab6 100644
--- a/offapi/com/sun/star/task/ErrorCodeRequest.idl
+++ b/offapi/com/sun/star/task/ErrorCodeRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_ErrorCodeRequest_idl__
#define __com_sun_star_task_ErrorCodeRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/Job.idl b/offapi/com/sun/star/task/Job.idl
index 7d55dea68b56..e62fdc72b76c 100644
--- a/offapi/com/sun/star/task/Job.idl
+++ b/offapi/com/sun/star/task/Job.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_task_Job_idl__
#define __com_sun_star_task_Job_idl__
-#ifndef __com_sun_star_task_XJob_idl__
#include <com/sun/star/task/XJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/JobExecutor.idl b/offapi/com/sun/star/task/JobExecutor.idl
index 2af18e08c5c1..f428076ddceb 100644
--- a/offapi/com/sun/star/task/JobExecutor.idl
+++ b/offapi/com/sun/star/task/JobExecutor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_task_JobExecutor_idl__
#define __com_sun_star_task_JobExecutor_idl__
-#ifndef __com_sun_star_task_XJobExecutor_idl__
#include <com/sun/star/task/XJobExecutor.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/MasterPasswordRequest.idl b/offapi/com/sun/star/task/MasterPasswordRequest.idl
index e72468eaf3b4..3bf90b307fbd 100644
--- a/offapi/com/sun/star/task/MasterPasswordRequest.idl
+++ b/offapi/com/sun/star/task/MasterPasswordRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_MasterPasswordRequest_idl__
#define __com_sun_star_task_MasterPasswordRequest_idl__
-#ifndef __com_sun_star_task_PasswordRequest_idl__
#include <com/sun/star/task/PasswordRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/NoMasterException.idl b/offapi/com/sun/star/task/NoMasterException.idl
index 03440309db9d..d44963375ef1 100644
--- a/offapi/com/sun/star/task/NoMasterException.idl
+++ b/offapi/com/sun/star/task/NoMasterException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_MasterPasswordRequest_idl__
#define __com_sun_star_task_MasterPasswordRequest_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
#include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/PDFExportException.idl b/offapi/com/sun/star/task/PDFExportException.idl
index 8547aea76418..d73c91d98452 100644
--- a/offapi/com/sun/star/task/PDFExportException.idl
+++ b/offapi/com/sun/star/task/PDFExportException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_PDFExportException_idl__
#define __com_sun_star_task_PDFExportException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module task {
diff --git a/offapi/com/sun/star/task/PasswordRequest.idl b/offapi/com/sun/star/task/PasswordRequest.idl
index 8a58340e48c4..62cda2850f41 100644
--- a/offapi/com/sun/star/task/PasswordRequest.idl
+++ b/offapi/com/sun/star/task/PasswordRequest.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_PasswordRequest_idl__
#define __com_sun_star_task_PasswordRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
#include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
index ac5358fbd002..8bc8eae7d39b 100644
--- a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
+++ b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_UnsupportedOverwriteRequest_idl__
#define __com_sun_star_task_UnsupportedOverwriteRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/UrlRecord.idl b/offapi/com/sun/star/task/UrlRecord.idl
index 84a856a87510..a628a38898b1 100644
--- a/offapi/com/sun/star/task/UrlRecord.idl
+++ b/offapi/com/sun/star/task/UrlRecord.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_UrlRecord_idl__
#define __com_sun_star_task_UrlRecord_idl__
-#ifndef __com_sun_star_task_UserRecord_idl__
#include <com/sun/star/task/UserRecord.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XAsyncJob.idl b/offapi/com/sun/star/task/XAsyncJob.idl
index f4d3de2362f8..68cdfc97c2b3 100644
--- a/offapi/com/sun/star/task/XAsyncJob.idl
+++ b/offapi/com/sun/star/task/XAsyncJob.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_task_XAsyncJob_idl__
#define __com_sun_star_task_XAsyncJob_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XInteractionApprove.idl b/offapi/com/sun/star/task/XInteractionApprove.idl
index ffcfa1e20035..d503eba5a035 100644
--- a/offapi/com/sun/star/task/XInteractionApprove.idl
+++ b/offapi/com/sun/star/task/XInteractionApprove.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionApprove_idl__
#define __com_sun_star_task_XInteractionApprove_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XInteractionDisapprove.idl b/offapi/com/sun/star/task/XInteractionDisapprove.idl
index 95cbf94aa7ac..de373737681b 100644
--- a/offapi/com/sun/star/task/XInteractionDisapprove.idl
+++ b/offapi/com/sun/star/task/XInteractionDisapprove.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionDisapprove_idl__
#define __com_sun_star_task_XInteractionDisapprove_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XInteractionPassword.idl b/offapi/com/sun/star/task/XInteractionPassword.idl
index 95309ccf5623..e8c55b13faed 100644
--- a/offapi/com/sun/star/task/XInteractionPassword.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionPassword_idl__
#define __com_sun_star_task_XInteractionPassword_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XInteractionPassword2.idl b/offapi/com/sun/star/task/XInteractionPassword2.idl
index 19e6042c3cf6..ac4e1c2c2311 100644
--- a/offapi/com/sun/star/task/XInteractionPassword2.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionPassword2_idl__
#define __com_sun_star_task_XInteractionPassword2_idl__
-#ifndef __com_sun_star_task_XInteractionPassword_idl__
#include <com/sun/star/task/XInteractionPassword.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
index f41bbcbddb93..47f03a10817d 100644
--- a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_task_XInteractionRequestStringResolver_idl__
#define __com_sun_star_task_XInteractionRequestStringResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
#include <com/sun/star/task/XInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XJob.idl b/offapi/com/sun/star/task/XJob.idl
index bd2b04d74f14..e33898b35bdf 100644
--- a/offapi/com/sun/star/task/XJob.idl
+++ b/offapi/com/sun/star/task/XJob.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_task_XJob_idl__
#define __com_sun_star_task_XJob_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/XJobExecutor.idl b/offapi/com/sun/star/task/XJobExecutor.idl
index 047c7116d7d7..a29b55d21858 100644
--- a/offapi/com/sun/star/task/XJobExecutor.idl
+++ b/offapi/com/sun/star/task/XJobExecutor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_task_XJobExecutor_idl__
#define __com_sun_star_task_XJobExecutor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XJobListener.idl b/offapi/com/sun/star/task/XJobListener.idl
index d4f27b69bd8f..a23085e97ca4 100644
--- a/offapi/com/sun/star/task/XJobListener.idl
+++ b/offapi/com/sun/star/task/XJobListener.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_task_XJobListener_idl__
#define __com_sun_star_task_XJobListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling.idl b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
index 591148b00bd5..6d3641a1968f 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
#define __com_sun_star_task_XMasterPasswordHandling_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
index fa6cd2a8766b..1f38b696cb8a 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_XMasterPasswordHandling2_idl__
#define __com_sun_star_task_XMasterPasswordHandling2_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
#include <com/sun/star/task/XMasterPasswordHandling.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XPasswordContainer.idl b/offapi/com/sun/star/task/XPasswordContainer.idl
index b363aa1684b6..093d9f88445e 100644
--- a/offapi/com/sun/star/task/XPasswordContainer.idl
+++ b/offapi/com/sun/star/task/XPasswordContainer.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_task_XPasswordContainer_idl__
#define __com_sun_star_task_XPasswordContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_UrlRecord_idl__
#include <com/sun/star/task/UrlRecord.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XRestartManager.idl b/offapi/com/sun/star/task/XRestartManager.idl
index c53d0954b415..e1869ae23432 100644
--- a/offapi/com/sun/star/task/XRestartManager.idl
+++ b/offapi/com/sun/star/task/XRestartManager.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_task_XRestartManager_idl__
#define __com_sun_star_task_XRestartManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/task/XStatusIndicator.idl b/offapi/com/sun/star/task/XStatusIndicator.idl
index d7fcc76b246a..5dae0e6527fd 100644
--- a/offapi/com/sun/star/task/XStatusIndicator.idl
+++ b/offapi/com/sun/star/task/XStatusIndicator.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XStatusIndicator_idl__
#define __com_sun_star_task_XStatusIndicator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
index b7f6b0ea62c1..e7fbed1f6f35 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
#define __com_sun_star_task_XStatusIndicatorFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
#include <com/sun/star/task/XStatusIndicator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
index c7e8630e55eb..8e1faa6eb909 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_XStatusIndicatorSupplier_idl__
#define __com_sun_star_task_XStatusIndicatorSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
#include <com/sun/star/task/XStatusIndicator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index 84b926569dac..bb6fe620b4f5 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_task_XUrlContainer_idl__
#define __com_sun_star_task_XUrlContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index 30601cbb51bc..d082a6d1eda5 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
#define __com_sun_star_text_AccessibleEndnoteView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index 9d6fd6f3e131..9c7f2623b237 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_AccessibleFootnoteView_idl__
#define __com_sun_star_text_AccessibleFootnoteView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index b4f73767f7c2..9d8c229256f5 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_AccessibleHeaderFooterView_idl__
#define __com_sun_star_text_AccessibleHeaderFooterView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index 6291da613fb7..cb087c093c70 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
#define __com_sun_star_text_AccessibleEndnoteView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 851bc80d3c10..db3975c09552 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_text_AccessibleParagraphView_idl__
#define __com_sun_star_text_AccessibleParagraphView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
#include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
#include <com/sun/star/accessibility/XAccessibleTextAttributes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index 1f85b2cc9a77..8378416afb8e 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_AccessibleTextDocumentPageView_idl__
#define __com_sun_star_text_AccessibleTextDocumentPageView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index bc364ca6e4fa..271a5fc0cccc 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_AccessibleTextDocumentView_idl__
#define __com_sun_star_text_AccessibleTextDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 67dcce7cb6ee..15462af83ec5 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
#define __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
#include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index a11fef5a4f19..6ade4dec43bf 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -27,18 +27,11 @@
#ifndef __com_sun_star_text_AccessibleTextFrameView_idl__
#define __com_sun_star_text_AccessibleTextFrameView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index 3e743e4e76cb..eb04fc45ecd0 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
#define __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
#include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AdvancedTextDocument.idl b/offapi/com/sun/star/text/AdvancedTextDocument.idl
index d308383c77ed..d194b5eae5c0 100644
--- a/offapi/com/sun/star/text/AdvancedTextDocument.idl
+++ b/offapi/com/sun/star/text/AdvancedTextDocument.idl
@@ -27,45 +27,25 @@
#ifndef __com_sun_star_text_AdvancedTextDocument_idl__
#define __com_sun_star_text_AdvancedTextDocument_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_text_HypertextDocument_idl__
#include <com/sun/star/text/HypertextDocument.idl>
-#endif
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
#include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
#include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-#ifndef __com_sun_star_text_XPagePrintable_idl__
#include <com/sun/star/text/XPagePrintable.idl>
-#endif
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
#include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
#include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
#include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl
index e9ef091ff59c..7185dc1d002c 100644
--- a/offapi/com/sun/star/text/AutoTextContainer.idl
+++ b/offapi/com/sun/star/text/AutoTextContainer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_AutoTextContainer_idl__
#define __com_sun_star_text_AutoTextContainer_idl__
-#ifndef __com_sun_star_text_XAutoTextContainer_idl__
#include <com/sun/star/text/XAutoTextContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AutoTextEntry.idl b/offapi/com/sun/star/text/AutoTextEntry.idl
index 2bed15210757..38706b8615fc 100644
--- a/offapi/com/sun/star/text/AutoTextEntry.idl
+++ b/offapi/com/sun/star/text/AutoTextEntry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_AutoTextEntry_idl__
#define __com_sun_star_text_AutoTextEntry_idl__
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
#include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl b/offapi/com/sun/star/text/AutoTextGroup.idl
index 1094649bfbb1..886a97d61d34 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_text_AutoTextGroup_idl__
#define __com_sun_star_text_AutoTextGroup_idl__
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
#include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/BaseFrame.idl b/offapi/com/sun/star/text/BaseFrame.idl
index 8864cfb14654..f227de1372f2 100644
--- a/offapi/com/sun/star/text/BaseFrame.idl
+++ b/offapi/com/sun/star/text/BaseFrame.idl
@@ -27,37 +27,15 @@
#ifndef __com_sun_star_text_BaseFrame_idl__
#define __com_sun_star_text_BaseFrame_idl__
-#ifndef __com_sun_star_text_BaseFrameProperties_idl__
#include <com/sun/star/text/BaseFrameProperties.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
#include <com/sun/star/text/XTextFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index 3e6178a50aa8..57cb6a42624b 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_text_BaseFrameProperties_idl__
#define __com_sun_star_text_BaseFrameProperties_idl__
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
#include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
#include <com/sun/star/text/WrapTextMode.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/BaseIndex.idl b/offapi/com/sun/star/text/BaseIndex.idl
index 20e2b2f49c53..a15366fa5a83 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -29,29 +29,13 @@
#ifndef __com_sun_star_text_BaseIndex_idl__
#define __com_sun_star_text_BaseIndex_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
#include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-#ifndef _com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef _com_sun_star_text_XTextColumns_idl__
#include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _com_sun_star_text_XTextSection_idl__
#include <com/sun/star/text/XTextSection.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/text/BaseIndexMark.idl b/offapi/com/sun/star/text/BaseIndexMark.idl
index 97632664ae27..29b1714cafc1 100644
--- a/offapi/com/sun/star/text/BaseIndexMark.idl
+++ b/offapi/com/sun/star/text/BaseIndexMark.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_BaseIndexMark_idl__
#define __com_sun_star_text_BaseIndexMark_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Bookmark.idl b/offapi/com/sun/star/text/Bookmark.idl
index d0e2f26db724..70b790600582 100644
--- a/offapi/com/sun/star/text/Bookmark.idl
+++ b/offapi/com/sun/star/text/Bookmark.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_Bookmark_idl__
#define __com_sun_star_text_Bookmark_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Bookmarks.idl b/offapi/com/sun/star/text/Bookmarks.idl
index 537133ca68be..dd5fd3233b0b 100644
--- a/offapi/com/sun/star/text/Bookmarks.idl
+++ b/offapi/com/sun/star/text/Bookmarks.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_Bookmarks_idl__
#define __com_sun_star_text_Bookmarks_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Cell.idl b/offapi/com/sun/star/text/Cell.idl
index 51f3e348cb7f..d4e35bb6d4c6 100644
--- a/offapi/com/sun/star/text/Cell.idl
+++ b/offapi/com/sun/star/text/Cell.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_text_Cell_idl__
#define __com_sun_star_text_Cell_idl__
-#ifndef __com_sun_star_text_CellProperties_idl__
#include <com/sun/star/text/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/CellProperties.idl b/offapi/com/sun/star/text/CellProperties.idl
index 67627ab25c12..47454bed6661 100644
--- a/offapi/com/sun/star/text/CellProperties.idl
+++ b/offapi/com/sun/star/text/CellProperties.idl
@@ -27,29 +27,13 @@
#ifndef __com_sun_star_text_CellProperties_idl__
#define __com_sun_star_text_CellProperties_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
#include <com/sun/star/text/XTextSection.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/CellRange.idl b/offapi/com/sun/star/text/CellRange.idl
index 1bae2b52cd3a..78a6b01d0d79 100644
--- a/offapi/com/sun/star/text/CellRange.idl
+++ b/offapi/com/sun/star/text/CellRange.idl
@@ -27,49 +27,19 @@
#ifndef __com_sun_star_text_CellRange_idl__
#define __com_sun_star_text_CellRange_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ChainedTextFrame.idl b/offapi/com/sun/star/text/ChainedTextFrame.idl
index 2fea57dcb5c8..ccaaf38b6381 100644
--- a/offapi/com/sun/star/text/ChainedTextFrame.idl
+++ b/offapi/com/sun/star/text/ChainedTextFrame.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_ChainedTextFrame_idl__
#define __com_sun_star_text_ChainedTextFrame_idl__
-#ifndef __com_sun_star_text_TextFrame_idl__
#include <com/sun/star/text/TextFrame.idl>
-#endif
-#ifndef __com_sun_star_util_XChainable_idl__
#include <com/sun/star/util/XChainable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ChapterNumberingRule.idl b/offapi/com/sun/star/text/ChapterNumberingRule.idl
index 1fac8ee733d5..15d597dda8a3 100644
--- a/offapi/com/sun/star/text/ChapterNumberingRule.idl
+++ b/offapi/com/sun/star/text/ChapterNumberingRule.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_ChapterNumberingRule_idl__
#define __com_sun_star_text_ChapterNumberingRule_idl__
-#ifndef __com_sun_star_style_NumberingRule_idl__
#include <com/sun/star/style/NumberingRule.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ContentIndexMark.idl b/offapi/com/sun/star/text/ContentIndexMark.idl
index 6ad0b8981f80..17c6ae0dac0a 100644
--- a/offapi/com/sun/star/text/ContentIndexMark.idl
+++ b/offapi/com/sun/star/text/ContentIndexMark.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_ContentIndexMark_idl__
#define __com_sun_star_text_ContentIndexMark_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
#include <com/sun/star/text/BaseIndexMark.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Defaults.idl b/offapi/com/sun/star/text/Defaults.idl
index f8e8c6a56de1..12da8259adec 100644
--- a/offapi/com/sun/star/text/Defaults.idl
+++ b/offapi/com/sun/star/text/Defaults.idl
@@ -27,28 +27,13 @@
#ifndef __com_sun_star_text_Defaults_idl__
#define __com_sun_star_text_Defaults_idl__
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DependentTextField.idl b/offapi/com/sun/star/text/DependentTextField.idl
index b98d07a865f4..ee1146fe17d0 100644
--- a/offapi/com/sun/star/text/DependentTextField.idl
+++ b/offapi/com/sun/star/text/DependentTextField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_DependentTextField_idl__
#define __com_sun_star_text_DependentTextField_idl__
-#ifndef __com_sun_star_text_TextField_idl__
#include <com/sun/star/text/TextField.idl>
-#endif
-#ifndef __com_sun_star_text_XDependentTextField_idl__
#include <com/sun/star/text/XDependentTextField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndex.idl b/offapi/com/sun/star/text/DocumentIndex.idl
index d5e6e96cc47d..8276b79f21ef 100644
--- a/offapi/com/sun/star/text/DocumentIndex.idl
+++ b/offapi/com/sun/star/text/DocumentIndex.idl
@@ -30,9 +30,7 @@
#define __com_sun_star_text_DocumentIndex_idl__
#include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
#include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 059a3edab680..f6d97462e988 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_DocumentIndex_idl__
#define __com_sun_star_text_DocumentIndex_idl__
-#ifndef _com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexMark.idl b/offapi/com/sun/star/text/DocumentIndexMark.idl
index 4f4d81e8b7ba..d0a7b0ede2ac 100644
--- a/offapi/com/sun/star/text/DocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/DocumentIndexMark.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_DocumentIndexMark_idl__
#define __com_sun_star_text_DocumentIndexMark_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
#include <com/sun/star/text/BaseIndexMark.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index c9e6eeb18c30..ffd6e8988297 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_DocumentIndex_idl__
#define __com_sun_star_text_DocumentIndex_idl__
-#ifndef _com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexes.idl b/offapi/com/sun/star/text/DocumentIndexes.idl
index d47a9c6bdfd4..8e624eea9b1e 100644
--- a/offapi/com/sun/star/text/DocumentIndexes.idl
+++ b/offapi/com/sun/star/text/DocumentIndexes.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_DocumentIndexes_idl__
#define __com_sun_star_text_DocumentIndexes_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index 27d1fc960a35..a89f5caba75b 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_TextDocumentSettings_idl__
#define __com_sun_star_text_TextDocumentSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintSettings_idl__
#include <com/sun/star/text/PrintSettings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
#include <com/sun/star/text/PrintPreviewSettings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Endnote.idl b/offapi/com/sun/star/text/Endnote.idl
index 0e4c64fdc2a9..e9a3fdd9c0a4 100644
--- a/offapi/com/sun/star/text/Endnote.idl
+++ b/offapi/com/sun/star/text/Endnote.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_Endnote_idl__
#define __com_sun_star_text_Endnote_idl__
-#ifndef __com_sun_star_text_Footnote_idl__
#include <com/sun/star/text/Footnote.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/EndnoteSettings.idl b/offapi/com/sun/star/text/EndnoteSettings.idl
index d64f55850a75..ae2b9aabfdea 100644
--- a/offapi/com/sun/star/text/EndnoteSettings.idl
+++ b/offapi/com/sun/star/text/EndnoteSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_EndnoteSettings_idl__
#define __com_sun_star_text_EndnoteSettings_idl__
-#ifndef __com_sun_star_text_FootnoteSettings_idl__
#include <com/sun/star/text/FootnoteSettings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Footnote.idl b/offapi/com/sun/star/text/Footnote.idl
index 3e23ff718f3c..cebca552d7ff 100644
--- a/offapi/com/sun/star/text/Footnote.idl
+++ b/offapi/com/sun/star/text/Footnote.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_Footnote_idl__
#define __com_sun_star_text_Footnote_idl__
-#ifndef __com_sun_star_text_XFootnote_idl__
#include <com/sun/star/text/XFootnote.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Footnotes.idl b/offapi/com/sun/star/text/Footnotes.idl
index d43811059d09..ebec4b05b023 100644
--- a/offapi/com/sun/star/text/Footnotes.idl
+++ b/offapi/com/sun/star/text/Footnotes.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_Footnotes_idl__
#define __com_sun_star_text_Footnotes_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl
index 9c983fb2133d..9e95d496a9d3 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -27,97 +27,29 @@
#ifndef __com_sun_star_text_GenericTextDocument_idl__
#define __com_sun_star_text_GenericTextDocument_idl__
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextDocument_idl__
#include <com/sun/star/text/XTextDocument.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSearchable_idl__
#include <com/sun/star/util/XSearchable.idl>
-#endif
-
-#ifndef _com_sun_star_util_XRefreshable_idl_
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
#include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
#include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPagePrintable_idl__
#include <com/sun/star/text/XPagePrintable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
#include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
#include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
#include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
#include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XBookmarksSupplier_idl__
#include <com/sun/star/text/XBookmarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
#include <com/sun/star/text/XDocumentIndexesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
#include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFramesSupplier_idl__
#include <com/sun/star/text/XTextFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
#include <com/sun/star/text/XTextSectionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/GlobalDocument.idl b/offapi/com/sun/star/text/GlobalDocument.idl
index 2e71c7ad3736..55b8ceb00042 100644
--- a/offapi/com/sun/star/text/GlobalDocument.idl
+++ b/offapi/com/sun/star/text/GlobalDocument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_GlobalDocument_idl__
#define __com_sun_star_text_GlobalDocument_idl__
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
#include <com/sun/star/text/GenericTextDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/GlobalSettings.idl b/offapi/com/sun/star/text/GlobalSettings.idl
index a39864be40d5..75d2a40aa00e 100644
--- a/offapi/com/sun/star/text/GlobalSettings.idl
+++ b/offapi/com/sun/star/text/GlobalSettings.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_BaseFrame_idl__
#define __com_sun_star_text_BaseFrame_idl__
-#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
#include <com/sun/star/view/XPrintSettingsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
#include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
diff --git a/offapi/com/sun/star/text/HypertextDocument.idl b/offapi/com/sun/star/text/HypertextDocument.idl
index 57e4ad874c38..50ce05428524 100644
--- a/offapi/com/sun/star/text/HypertextDocument.idl
+++ b/offapi/com/sun/star/text/HypertextDocument.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_text_HypertextDocument_idl__
#define __com_sun_star_text_HypertextDocument_idl__
-#ifndef __com_sun_star_text_TextDocument_idl__
#include <com/sun/star/text/TextDocument.idl>
-#endif
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
#include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
index 5eac10714576..5e80c49ddaf4 100644
--- a/offapi/com/sun/star/text/InContentMetadata.idl
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_text_InContentMetadata_idl__
#define __com_sun_star_text_InContentMetadata_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
#include <com/sun/star/rdf/XMetadatable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/InvalidTextContentException.idl b/offapi/com/sun/star/text/InvalidTextContentException.idl
index 08dba3fb86c8..0f0381caf562 100644
--- a/offapi/com/sun/star/text/InvalidTextContentException.idl
+++ b/offapi/com/sun/star/text/InvalidTextContentException.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_InvalidTextContentException_idl__
#define __com_sun_star_text_InvalidTextContentException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/LineNumberingProperties.idl b/offapi/com/sun/star/text/LineNumberingProperties.idl
index b8c2c99b29e0..605fee295848 100644
--- a/offapi/com/sun/star/text/LineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/LineNumberingProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_LineNumberingProperties_idl__
#define __com_sun_star_text_LineNumberingProperties_idl__
-#ifndef __com_sun_star_text_XLineNumberingProperties_idl__
#include <com/sun/star/text/XLineNumberingProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl
index 890ae7a0bc0d..d84c7eb2ab9f 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -27,27 +27,13 @@
#ifndef __com_sun_star_text_MailMerge_idl__
#define __com_sun_star_text_MailMerge_idl__
-#ifndef __com_sun_star_task_XJob_idl__
#include <com/sun/star/task/XJob.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeBroadcaster_idl__
#include <com/sun/star/text/XMailMergeBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
#include <com/sun/star/sdb/DataAccessDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/MailMergeEvent.idl b/offapi/com/sun/star/text/MailMergeEvent.idl
index 564ff0bfcf07..935810f756e7 100644
--- a/offapi/com/sun/star/text/MailMergeEvent.idl
+++ b/offapi/com/sun/star/text/MailMergeEvent.idl
@@ -29,12 +29,8 @@
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl
index 9443a9a2740e..70d11f871502 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_text_NumberingLevel_idl__
#define __com_sun_star_text_NumberingLevel_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/NumberingRules.idl b/offapi/com/sun/star/text/NumberingRules.idl
index 89d8f214bc9f..d6537e668def 100644
--- a/offapi/com/sun/star/text/NumberingRules.idl
+++ b/offapi/com/sun/star/text/NumberingRules.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_NumberingRules_idl__
#define __com_sun_star_text_NumberingRules_idl__
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/NumberingStyle.idl b/offapi/com/sun/star/text/NumberingStyle.idl
index d3e30f809c36..9cda21074fbb 100644
--- a/offapi/com/sun/star/text/NumberingStyle.idl
+++ b/offapi/com/sun/star/text/NumberingStyle.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_style_NumberingStyle_idl__
#define __com_sun_star_style_NumberingStyle_idl__
-#ifndef __com_sun_star_style_Style_idl__
#include <com/sun/star/style/Style.idl>
-#endif
-#ifndef __com_sun_star_text_NumberingRules_idl__
#include <com/sun/star/text/NumberingRules.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/PageFootnoteInfo.idl b/offapi/com/sun/star/text/PageFootnoteInfo.idl
index e8f1931cc95a..24f892dc54b4 100644
--- a/offapi/com/sun/star/text/PageFootnoteInfo.idl
+++ b/offapi/com/sun/star/text/PageFootnoteInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_PageFootnoteInfo_idl__
#define __com_sun_star_text_PageFootnoteInfo_idl__
-#ifndef __com_sun_star_text_HorizontalAdjust_idl__
#include <com/sun/star/text/HorizontalAdjust.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Paragraph.idl b/offapi/com/sun/star/text/Paragraph.idl
index ee75fed06ca6..e756f4a455da 100644
--- a/offapi/com/sun/star/text/Paragraph.idl
+++ b/offapi/com/sun/star/text/Paragraph.idl
@@ -27,49 +27,18 @@
#ifndef __com_sun_star_text_Paragraph_idl__
#define __com_sun_star_text_Paragraph_idl__
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextTable_idl__
#include <com/sun/star/text/TextTable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ParagraphEnumeration.idl b/offapi/com/sun/star/text/ParagraphEnumeration.idl
index 9e2ec8253e34..f678085251d7 100644
--- a/offapi/com/sun/star/text/ParagraphEnumeration.idl
+++ b/offapi/com/sun/star/text/ParagraphEnumeration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_ParagraphEnumeration_idl__
#define __com_sun_star_text_ParagraphEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
index eb57288200fb..be972b8c9247 100644
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
#define __com_sun_star_text_PrintPreviewSettings_idl__
-#ifndef __com_sun_star_text_NotePrintMode_idl__
#include <com/sun/star/text/NotePrintMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/PrintSettings.idl b/offapi/com/sun/star/text/PrintSettings.idl
index 82f55f3bc2b6..7cfd33f74127 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_PrintSettings_idl__
#define __com_sun_star_text_PrintSettings_idl__
-#ifndef __com_sun_star_text_NotePrintMode_idl__
#include <com/sun/star/text/NotePrintMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index c399d976e04a..0ec41a9f1397 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_text_RedlinePortion_idl__
#define __com_sun_star_text_RedlinePortion_idl__
-#ifndef __com_sun_star_text_TextPortion_idl__
#include <com/sun/star/text/TextPortion.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ReferenceMark.idl b/offapi/com/sun/star/text/ReferenceMark.idl
index 1dc073beacdb..76d9740b8a2a 100644
--- a/offapi/com/sun/star/text/ReferenceMark.idl
+++ b/offapi/com/sun/star/text/ReferenceMark.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_ReferenceMark_idl__
#define __com_sun_star_text_ReferenceMark_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ReferenceMarks.idl b/offapi/com/sun/star/text/ReferenceMarks.idl
index bbc38ec21eef..9551ad920212 100644
--- a/offapi/com/sun/star/text/ReferenceMarks.idl
+++ b/offapi/com/sun/star/text/ReferenceMarks.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_ReferenceMarks_idl__
#define __com_sun_star_text_ReferenceMarks_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Shape.idl b/offapi/com/sun/star/text/Shape.idl
index a7fe22ae5935..a5d34fa1ddec 100644
--- a/offapi/com/sun/star/text/Shape.idl
+++ b/offapi/com/sun/star/text/Shape.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_text_Shape_idl__
#define __com_sun_star_text_Shape_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
#include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
#include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
#include <com/sun/star/text/WrapTextMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TableColumns.idl b/offapi/com/sun/star/text/TableColumns.idl
index bb83142f18ee..b7d7a9923772 100644
--- a/offapi/com/sun/star/text/TableColumns.idl
+++ b/offapi/com/sun/star/text/TableColumns.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_table_TableColumns_idl__
#define __com_sun_star_table_TableColumns_idl__
-#ifndef __com_sun_star_table_XTableColumns_idl__
#include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TableRows.idl b/offapi/com/sun/star/text/TableRows.idl
index f3989d11a891..e0d539a76bbc 100644
--- a/offapi/com/sun/star/text/TableRows.idl
+++ b/offapi/com/sun/star/text/TableRows.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_table_TableRows_idl__
#define __com_sun_star_table_TableRows_idl__
-#ifndef __com_sun_star_table_XTableRows_idl__
#include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/Text.idl b/offapi/com/sun/star/text/Text.idl
index 1be2ff65e6c6..c6a6edf3b4fa 100644
--- a/offapi/com/sun/star/text/Text.idl
+++ b/offapi/com/sun/star/text/Text.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_text_Text_idl__
#define __com_sun_star_text_Text_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextColumnSequence.idl b/offapi/com/sun/star/text/TextColumnSequence.idl
index f580489f89ad..c43d9cd1b6ed 100644
--- a/offapi/com/sun/star/text/TextColumnSequence.idl
+++ b/offapi/com/sun/star/text/TextColumnSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextColumnSequence_idl__
#define __com_sun_star_text_TextColumnSequence_idl__
-#ifndef __com_sun_star_text_TextColumn_idl__
#include <com/sun/star/text/TextColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index 222f4089b3a9..d4cfbfee8f09 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_TextColumns_idl__
#define __com_sun_star_text_TextColumns_idl__
-#ifndef __com_sun_star_text_XTextColumns_idl__
#include <com/sun/star/text/XTextColumns.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/text/TextContent.idl b/offapi/com/sun/star/text/TextContent.idl
index 4efab8af7377..8635c20c4dad 100644
--- a/offapi/com/sun/star/text/TextContent.idl
+++ b/offapi/com/sun/star/text/TextContent.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_TextContent_idl__
#define __com_sun_star_text_TextContent_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
#include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-
-#ifndef __com_sun_star_text_WrapTextMode_idl__
#include <com/sun/star/text/WrapTextMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextContentCollection.idl b/offapi/com/sun/star/text/TextContentCollection.idl
index 602a6adb1fdb..044d0409016d 100644
--- a/offapi/com/sun/star/text/TextContentCollection.idl
+++ b/offapi/com/sun/star/text/TextContentCollection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_TextContentCollection_idl__
#define __com_sun_star_text_TextContentCollection_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextCursor.idl b/offapi/com/sun/star/text/TextCursor.idl
index 2882fd5ab2fa..70566c29754c 100644
--- a/offapi/com/sun/star/text/TextCursor.idl
+++ b/offapi/com/sun/star/text/TextCursor.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_text_TextCursor_idl__
#define __com_sun_star_text_TextCursor_idl__
-#ifndef __com_sun_star_text_TextRange_idl__
#include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XWordCursor_idl__
#include <com/sun/star/text/XWordCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSentenceCursor_idl__
#include <com/sun/star/text/XSentenceCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XParagraphCursor_idl__
#include <com/sun/star/text/XParagraphCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
#include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInsertable_idl__
#include <com/sun/star/document/XDocumentInsertable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextDocument.idl b/offapi/com/sun/star/text/TextDocument.idl
index 586fc917e6f3..86ef725ed266 100644
--- a/offapi/com/sun/star/text/TextDocument.idl
+++ b/offapi/com/sun/star/text/TextDocument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextDocument_idl__
#define __com_sun_star_text_TextDocument_idl__
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
#include <com/sun/star/text/GenericTextDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextDocumentView.idl b/offapi/com/sun/star/text/TextDocumentView.idl
index 7f4616781168..5bf5d12f915e 100644
--- a/offapi/com/sun/star/text/TextDocumentView.idl
+++ b/offapi/com/sun/star/text/TextDocumentView.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_text_TextDocumentView_idl__
#define __com_sun_star_text_TextDocumentView_idl__
-#ifndef __com_sun_star_view_OfficeDocumentView_idl__
#include <com/sun/star/view/OfficeDocumentView.idl>
-#endif
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
#include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
-#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
#include <com/sun/star/text/XTextViewCursorSupplier.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextEmbeddedObject.idl b/offapi/com/sun/star/text/TextEmbeddedObject.idl
index bb7aad2c4dba..4e9d7a4d17a5 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObject.idl
@@ -27,16 +27,9 @@
#ifndef __com_sun_star_text_TextEmbeddedObject_idl__
#define __com_sun_star_text_TextEmbeddedObject_idl__
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
#include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
#include <com/sun/star/text/BaseFrame.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextEmbeddedObjects.idl b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
index 61d76be3db50..eaf5cb70e1bb 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObjects.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextEmbeddedObjects_idl__
#define __com_sun_star_text_TextEmbeddedObjects_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextField.idl b/offapi/com/sun/star/text/TextField.idl
index af0973009223..4f80d16d72ac 100644
--- a/offapi/com/sun/star/text/TextField.idl
+++ b/offapi/com/sun/star/text/TextField.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_TextField_idl__
#define __com_sun_star_text_TextField_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextField_idl__
#include <com/sun/star/text/XTextField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldEnumeration.idl b/offapi/com/sun/star/text/TextFieldEnumeration.idl
index 5502559aa0d1..022de0658afe 100644
--- a/offapi/com/sun/star/text/TextFieldEnumeration.idl
+++ b/offapi/com/sun/star/text/TextFieldEnumeration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextFieldEnumeration_idl__
#define __com_sun_star_text_TextFieldEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldMaster.idl b/offapi/com/sun/star/text/TextFieldMaster.idl
index 65251cdea0e5..a86796df25bf 100644
--- a/offapi/com/sun/star/text/TextFieldMaster.idl
+++ b/offapi/com/sun/star/text/TextFieldMaster.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_TextFieldMaster_idl__
#define __com_sun_star_text_TextFieldMaster_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XDependentTextField_idl__
#include <com/sun/star/text/XDependentTextField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldMasters.idl b/offapi/com/sun/star/text/TextFieldMasters.idl
index e176b13fbcdb..f7a0f5902808 100644
--- a/offapi/com/sun/star/text/TextFieldMasters.idl
+++ b/offapi/com/sun/star/text/TextFieldMasters.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextFieldMasters_idl__
#define __com_sun_star_text_TextFieldMasters_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFields.idl b/offapi/com/sun/star/text/TextFields.idl
index c791be596186..34e76aeada1f 100644
--- a/offapi/com/sun/star/text/TextFields.idl
+++ b/offapi/com/sun/star/text/TextFields.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextFields_idl__
#define __com_sun_star_text_TextFields_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFrame.idl b/offapi/com/sun/star/text/TextFrame.idl
index 1f7057ca27db..9ef5a9e1ee6c 100644
--- a/offapi/com/sun/star/text/TextFrame.idl
+++ b/offapi/com/sun/star/text/TextFrame.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextFrame_idl__
#define __com_sun_star_text_TextFrame_idl__
-#ifndef __com_sun_star_text_XTextFrame_idl__
#include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
#include <com/sun/star/text/BaseFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextFrames.idl b/offapi/com/sun/star/text/TextFrames.idl
index b6be445057ea..3fe3a6f2b5a7 100644
--- a/offapi/com/sun/star/text/TextFrames.idl
+++ b/offapi/com/sun/star/text/TextFrames.idl
@@ -27,16 +27,9 @@
#ifndef __com_sun_star_text_TextFrames_idl__
#define __com_sun_star_text_TextFrames_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl
index 2e228e9cd8d5..0ad45d0a633c 100644
--- a/offapi/com/sun/star/text/TextGraphicObject.idl
+++ b/offapi/com/sun/star/text/TextGraphicObject.idl
@@ -27,26 +27,12 @@
#ifndef __com_sun_star_text_TextGraphicObject_idl__
#define __com_sun_star_text_TextGraphicObject_idl__
-#ifndef __com_sun_star_text_BaseFrame_idl__
#include <com/sun/star/text/BaseFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_GraphicCrop_idl__
#include <com/sun/star/text/GraphicCrop.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-#ifndef __com_sun_star_drawing_ColorMode_idl__
#include <com/sun/star/drawing/ColorMode.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextGraphicObjects.idl b/offapi/com/sun/star/text/TextGraphicObjects.idl
index 3aff7dbdce59..b8fde4b0d5b2 100644
--- a/offapi/com/sun/star/text/TextGraphicObjects.idl
+++ b/offapi/com/sun/star/text/TextGraphicObjects.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextGraphicObjects_idl__
#define __com_sun_star_text_TextGraphicObjects_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextLayoutCursor.idl b/offapi/com/sun/star/text/TextLayoutCursor.idl
index 0849204150fa..4b5fa9a1c95d 100644
--- a/offapi/com/sun/star/text/TextLayoutCursor.idl
+++ b/offapi/com/sun/star/text/TextLayoutCursor.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextLayoutCursor_idl__
#define __com_sun_star_text_TextLayoutCursor_idl__
-#ifndef __com_sun_star_text_TextCursor_idl__
#include <com/sun/star/text/TextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPageCursor_idl__
#include <com/sun/star/text/XPageCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
index d6f2ba9c059e..5921ae31e7d3 100644
--- a/offapi/com/sun/star/text/TextMarkupDescriptor.idl
+++ b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
#define __com_sun_star_text_TextMarkupDescriptor_idl__
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
#include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
#include <com/sun/star/text/TextMarkupType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextPageStyle.idl b/offapi/com/sun/star/text/TextPageStyle.idl
index 0ef1290be716..63bf484c91a0 100644
--- a/offapi/com/sun/star/text/TextPageStyle.idl
+++ b/offapi/com/sun/star/text/TextPageStyle.idl
@@ -28,34 +28,15 @@
#ifndef __com_sun_star_text_TextPageStyle_idl__
#define __com_sun_star_text_TextPageStyle_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
#include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
#include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
#include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 3bfc745d97da..6791f0ead82a 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -28,29 +28,12 @@
#define __com_sun_star_text_TextPortion_idl__
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
#include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
#include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextField_idl__
#include <com/sun/star/text/XTextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
#include <com/sun/star/text/XFootnote.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextPortionEnumeration.idl b/offapi/com/sun/star/text/TextPortionEnumeration.idl
index 0472a874d260..abd556b7740b 100644
--- a/offapi/com/sun/star/text/TextPortionEnumeration.idl
+++ b/offapi/com/sun/star/text/TextPortionEnumeration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextPortionEnumeration_idl__
#define __com_sun_star_text_TextPortionEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextRange.idl b/offapi/com/sun/star/text/TextRange.idl
index 7fe5d2ed37c5..2ecd9c22e047 100644
--- a/offapi/com/sun/star/text/TextRange.idl
+++ b/offapi/com/sun/star/text/TextRange.idl
@@ -27,40 +27,16 @@
#ifndef __com_sun_star_text_TextRange_idl__
#define __com_sun_star_text_TextRange_idl__
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
#include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextRangeContentProperties.idl b/offapi/com/sun/star/text/TextRangeContentProperties.idl
index 74acb67cf9ed..c425dbbe3273 100644
--- a/offapi/com/sun/star/text/TextRangeContentProperties.idl
+++ b/offapi/com/sun/star/text/TextRangeContentProperties.idl
@@ -28,37 +28,14 @@
#ifndef __com_sun_star_text_TextRangeContentProperties_idl__
#define __com_sun_star_text_TextRangeContentProperties_idl__
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
#include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
#include <com/sun/star/text/XTextTable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFrame_idl__
#include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
#include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
#include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
#include <com/sun/star/text/XFootnote.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextRanges.idl b/offapi/com/sun/star/text/TextRanges.idl
index 38ecb4c18662..31513ce52245 100644
--- a/offapi/com/sun/star/text/TextRanges.idl
+++ b/offapi/com/sun/star/text/TextRanges.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextRanges_idl__
#define __com_sun_star_text_TextRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextSection.idl b/offapi/com/sun/star/text/TextSection.idl
index f406eda50767..d266dd0987bb 100644
--- a/offapi/com/sun/star/text/TextSection.idl
+++ b/offapi/com/sun/star/text/TextSection.idl
@@ -27,38 +27,15 @@
#ifndef __com_sun_star_text_TextSection_idl__
#define __com_sun_star_text_TextSection_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
#include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_text_SectionFileLink_idl__
#include <com/sun/star/text/SectionFileLink.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
#include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextSections.idl b/offapi/com/sun/star/text/TextSections.idl
index de333df8afeb..52f721db65e0 100644
--- a/offapi/com/sun/star/text/TextSections.idl
+++ b/offapi/com/sun/star/text/TextSections.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_TextSections_idl__
#define __com_sun_star_text_TextSections_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextSortDescriptor.idl b/offapi/com/sun/star/text/TextSortDescriptor.idl
index 19993c5fc442..3c578eb5efc0 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_TextSortDescriptor_idl__
#define __com_sun_star_text_TextSortDescriptor_idl__
-#ifndef __com_sun_star_util_SortDescriptor_idl__
#include <com/sun/star/util/SortDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextSortDescriptor2.idl b/offapi/com/sun/star/text/TextSortDescriptor2.idl
index 650702e64ddc..ea78db37d665 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor2.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor2.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_text_TextSortDescriptor2_idl__
#define __com_sun_star_text_TextSortDescriptor2_idl__
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
#include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
#include <com/sun/star/table/TableSortField.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
#include <com/sun/star/table/TableSortFieldType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextSortable.idl b/offapi/com/sun/star/text/TextSortable.idl
index 3cef05049d0b..e1c2ba907bb5 100644
--- a/offapi/com/sun/star/text/TextSortable.idl
+++ b/offapi/com/sun/star/text/TextSortable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_TextSortable_idl__
#define __com_sun_star_util_TextSortable_idl__
-#ifndef __com_sun_star_text_TextSortDescriptor_idl__
#include <com/sun/star/text/TextSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextTable.idl b/offapi/com/sun/star/text/TextTable.idl
index abd9ea3f26b4..aac02f469e0b 100644
--- a/offapi/com/sun/star/text/TextTable.idl
+++ b/offapi/com/sun/star/text/TextTable.idl
@@ -27,59 +27,22 @@
#ifndef __com_sun_star_text_TextTable_idl__
#define __com_sun_star_text_TextTable_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
#include <com/sun/star/text/XTextTable.idl>
-#endif
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
#include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
#include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_TableBorder_idl__
#include <com/sun/star/table/TableBorder.idl>
-#endif
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
#include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextTableCursor.idl b/offapi/com/sun/star/text/TextTableCursor.idl
index b5b108ef3a72..c69f7caf70a2 100644
--- a/offapi/com/sun/star/text/TextTableCursor.idl
+++ b/offapi/com/sun/star/text/TextTableCursor.idl
@@ -27,28 +27,13 @@
#ifndef __com_sun_star_text_TextTableCursor_idl__
#define __com_sun_star_text_TextTableCursor_idl__
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
#include <com/sun/star/text/XTextTableCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl
index b1eca1467b89..79cc8e933575 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_text_TextTableRow_idl__
#define __com_sun_star_text_TextTableRow_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
#include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
#include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextTables.idl b/offapi/com/sun/star/text/TextTables.idl
index 55daffa1a074..1af924802b2e 100644
--- a/offapi/com/sun/star/text/TextTables.idl
+++ b/offapi/com/sun/star/text/TextTables.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_TextTables_idl__
#define __com_sun_star_text_TextTables_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/TextViewCursor.idl b/offapi/com/sun/star/text/TextViewCursor.idl
index 119d13cf78c1..3224c8f219cb 100644
--- a/offapi/com/sun/star/text/TextViewCursor.idl
+++ b/offapi/com/sun/star/text/TextViewCursor.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_TextViewCursor_idl__
#define __com_sun_star_text_TextViewCursor_idl__
-#ifndef __com_sun_star_text_TextLayoutCursor_idl__
#include <com/sun/star/text/TextLayoutCursor.idl>
-#endif
-
-#ifndef __com_sun_star_view_XScreenCursor_idl__
#include <com/sun/star/view/XScreenCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/UserDefinedIndex.idl b/offapi/com/sun/star/text/UserDefinedIndex.idl
index 2f1f943cfa86..950a0e9b9e7b 100644
--- a/offapi/com/sun/star/text/UserDefinedIndex.idl
+++ b/offapi/com/sun/star/text/UserDefinedIndex.idl
@@ -30,9 +30,7 @@
#define __com_sun_star_text_UserDefinedIndex_idl__
#include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
#include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/UserIndexMark.idl b/offapi/com/sun/star/text/UserIndexMark.idl
index 140adc1487ed..5ac9f3a9c70b 100644
--- a/offapi/com/sun/star/text/UserIndexMark.idl
+++ b/offapi/com/sun/star/text/UserIndexMark.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_UserIndexMark_idl__
#define __com_sun_star_text_UserIndexMark_idl__
-#ifndef __com_sun_star_text_TextContent_idl__
#include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
#include <com/sun/star/text/BaseIndexMark.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 4890c36182b5..3ffa73d17a66 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_text_ViewSettings_idl__
#define __com_sun_star_text_ViewSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_DocumentZoomType_idl__
#include <com/sun/star/view/DocumentZoomType.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/WebDocument.idl b/offapi/com/sun/star/text/WebDocument.idl
index 62b6294ff5ac..65446cf67917 100644
--- a/offapi/com/sun/star/text/WebDocument.idl
+++ b/offapi/com/sun/star/text/WebDocument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_WebDocument_idl__
#define __com_sun_star_text_WebDocument_idl__
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
#include <com/sun/star/text/GenericTextDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 9f091683c014..bbdc80abf75c 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_text_XAutoTextContainer_idl__
#define __com_sun_star_text_XAutoTextContainer_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
#include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XAutoTextEntry.idl b/offapi/com/sun/star/text/XAutoTextEntry.idl
index 89178464a4f4..93e31d60cad2 100644
--- a/offapi/com/sun/star/text/XAutoTextEntry.idl
+++ b/offapi/com/sun/star/text/XAutoTextEntry.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XAutoTextEntry_idl__
#define __com_sun_star_text_XAutoTextEntry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XAutoTextGroup.idl b/offapi/com/sun/star/text/XAutoTextGroup.idl
index b9f33cb71fb8..ff448855d922 100644
--- a/offapi/com/sun/star/text/XAutoTextGroup.idl
+++ b/offapi/com/sun/star/text/XAutoTextGroup.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_text_XAutoTextGroup_idl__
#define __com_sun_star_text_XAutoTextGroup_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
#include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XBookmarkInsertTool.idl b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
index c519407336ee..23513c442bd7 100644
--- a/offapi/com/sun/star/text/XBookmarkInsertTool.idl
+++ b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_text_XBookmarkInsertTool_idl__
#define __com_sun_star_text_XBookmarkInsertTool_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XBookmarksSupplier.idl b/offapi/com/sun/star/text/XBookmarksSupplier.idl
index 46b841bfa649..1345fab7b811 100644
--- a/offapi/com/sun/star/text/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/text/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XBookmarksSupplier_idl__
#define __com_sun_star_text_XBookmarksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
index de7ced8fa668..8cd9dea9455e 100644
--- a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
#define __com_sun_star_text_XChapterNumberingSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
index 354d79d882c8..cce947fa9f8f 100644
--- a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_text_XDefaultNumberingProvider_idl__
#define __com_sun_star_text_XDefaultNumberingProvider_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
module com { module sun { module star { module text {
diff --git a/offapi/com/sun/star/text/XDependentTextField.idl b/offapi/com/sun/star/text/XDependentTextField.idl
index 3b659669a2ea..6d3f8f319742 100644
--- a/offapi/com/sun/star/text/XDependentTextField.idl
+++ b/offapi/com/sun/star/text/XDependentTextField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_text_XDependentTextField_idl__
#define __com_sun_star_text_XDependentTextField_idl__
-#ifndef __com_sun_star_text_XTextField_idl__
#include <com/sun/star/text/XTextField.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XDocumentIndex.idl b/offapi/com/sun/star/text/XDocumentIndex.idl
index dcdb34eab80d..2cc73f5a9bd4 100644
--- a/offapi/com/sun/star/text/XDocumentIndex.idl
+++ b/offapi/com/sun/star/text/XDocumentIndex.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XDocumentIndex_idl__
#define __com_sun_star_text_XDocumentIndex_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XDocumentIndexMark.idl b/offapi/com/sun/star/text/XDocumentIndexMark.idl
index d643eb15cd39..96d83dec792b 100644
--- a/offapi/com/sun/star/text/XDocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexMark.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
#define __com_sun_star_text_XDocumentIndexMark_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
index 6005771299b8..65a4ed4f5c55 100644
--- a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
#define __com_sun_star_text_XDocumentIndexesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
index 51bb77195aae..ba05e346dcc3 100644
--- a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XEndnotesSettingsSupplier_idl__
#define __com_sun_star_text_XEndnotesSettingsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XEndnotesSupplier.idl b/offapi/com/sun/star/text/XEndnotesSupplier.idl
index 62d962aa6573..8ecbb976e8fc 100644
--- a/offapi/com/sun/star/text/XEndnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
#define __com_sun_star_text_XEndnotesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XFlatParagraph.idl b/offapi/com/sun/star/text/XFlatParagraph.idl
index 0d9f5de7e75f..d9cb0b91ddaf 100644
--- a/offapi/com/sun/star/text/XFlatParagraph.idl
+++ b/offapi/com/sun/star/text/XFlatParagraph.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_text_XFlatParagraph_idl__
#define __com_sun_star_text_XFlatParagraph_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
#include <com/sun/star/text/XTextMarkup.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XFlatParagraphIterator.idl b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
index dd90fe398cb8..854eb8be26b6 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIterator.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
#define __com_sun_star_text_XFlatParagraphIterator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
#include <com/sun/star/text/XFlatParagraph.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
index b57187603548..30f02341c42e 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
#define __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
#include <com/sun/star/text/XFlatParagraphIterator.idl>
-#endif
//---------------------------------------Note----------------------------------
// allows for different iterators for grammar checking and smart tags,
diff --git a/offapi/com/sun/star/text/XFootnote.idl b/offapi/com/sun/star/text/XFootnote.idl
index dc01b8955cf1..e1d052e87f2e 100644
--- a/offapi/com/sun/star/text/XFootnote.idl
+++ b/offapi/com/sun/star/text/XFootnote.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XFootnote_idl__
#define __com_sun_star_text_XFootnote_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
index 41b68e586903..34450cf21eff 100644
--- a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XFootnotesSettingsSupplier_idl__
#define __com_sun_star_text_XFootnotesSettingsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XFootnotesSupplier.idl b/offapi/com/sun/star/text/XFootnotesSupplier.idl
index 91630c7275df..f477d06d6526 100644
--- a/offapi/com/sun/star/text/XFootnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
#define __com_sun_star_text_XFootnotesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XHeaderFooter.idl b/offapi/com/sun/star/text/XHeaderFooter.idl
index 048e32cc8118..05af56cb8fc3 100644
--- a/offapi/com/sun/star/text/XHeaderFooter.idl
+++ b/offapi/com/sun/star/text/XHeaderFooter.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_XHeaderFooter_idl__
#define __com_sun_star_text_XHeaderFooter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
index 8cd1479f5df1..84e8108f826e 100644
--- a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
+++ b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__
#define __com_sun_star_text_XHeaderFooterPageStyle_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XHeaderFooter_idl__
#include <com/sun/star/text/XHeaderFooter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XLineNumberingProperties.idl b/offapi/com/sun/star/text/XLineNumberingProperties.idl
index af52294119a0..c07db262147b 100644
--- a/offapi/com/sun/star/text/XLineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/XLineNumberingProperties.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_XLineNumberingProperties_idl__
#define __com_sun_star_text_XLineNumberingProperties_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
index e12b433a5572..bb1a815b88e8 100644
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
#define __com_sun_star_text_XLineNumberingSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
index a4a0d0aa1192..e1c57f0db092 100644
--- a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
+++ b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
@@ -28,12 +28,8 @@
#define __com_sun_star_text_XMailMergeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeListener_idl__
#include <com/sun/star/text/XMailMergeListener.idl>
-#endif
//module com { module sun { module star { module text {
// published interface XMailMergeListener;
diff --git a/offapi/com/sun/star/text/XMailMergeListener.idl b/offapi/com/sun/star/text/XMailMergeListener.idl
index 1bc0a85a4504..24705e14b8e7 100644
--- a/offapi/com/sun/star/text/XMailMergeListener.idl
+++ b/offapi/com/sun/star/text/XMailMergeListener.idl
@@ -28,12 +28,8 @@
#define __com_sun_star_text_XMailMergeListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_MailMergeEvent_idl__
#include <com/sun/star/text/MailMergeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XModule.idl b/offapi/com/sun/star/text/XModule.idl
index 49d0d38085b9..3a249db3e7e9 100644
--- a/offapi/com/sun/star/text/XModule.idl
+++ b/offapi/com/sun/star/text/XModule.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XModule_idl__
#define __com_sun_star_text_XModule_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XMultiTextMarkup.idl b/offapi/com/sun/star/text/XMultiTextMarkup.idl
index 27fdefb0472e..33cfa2ba830c 100644
--- a/offapi/com/sun/star/text/XMultiTextMarkup.idl
+++ b/offapi/com/sun/star/text/XMultiTextMarkup.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_text_XMultiTextMarkup_idl__
#define __com_sun_star_text_XMultiTextMarkup_idl__
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
#include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
#include <com/sun/star/text/TextMarkupDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XNumberingFormatter.idl b/offapi/com/sun/star/text/XNumberingFormatter.idl
index 2b86fc6b24c0..5f0a56b93334 100644
--- a/offapi/com/sun/star/text/XNumberingFormatter.idl
+++ b/offapi/com/sun/star/text/XNumberingFormatter.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_text_XNumberingFormatter_idl__
#define __com_sun_star_text_XNumberingFormatter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com { module sun { module star { module text {
/**
diff --git a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
index 818533169c2e..7585d1bdca1d 100644
--- a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
+++ b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_XNumberingRulesSupplier_idl__
#define __com_sun_star_text_XNumberingRulesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XNumberingTypeInfo.idl b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
index 39c8293e25c1..49d02f5edf90 100644
--- a/offapi/com/sun/star/text/XNumberingTypeInfo.idl
+++ b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XNumberingTypeInfo_idl__
#define __com_sun_star_text_XNumberingTypeInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module text {
diff --git a/offapi/com/sun/star/text/XPageCursor.idl b/offapi/com/sun/star/text/XPageCursor.idl
index 1cfc0dbcfa8c..d1c03cd046eb 100644
--- a/offapi/com/sun/star/text/XPageCursor.idl
+++ b/offapi/com/sun/star/text/XPageCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XPageCursor_idl__
#define __com_sun_star_text_XPageCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XPagePrintable.idl b/offapi/com/sun/star/text/XPagePrintable.idl
index 7e1a22b83973..876790e537ed 100644
--- a/offapi/com/sun/star/text/XPagePrintable.idl
+++ b/offapi/com/sun/star/text/XPagePrintable.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_XPagePrintable_idl__
#define __com_sun_star_text_XPagePrintable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XParagraphAppend.idl b/offapi/com/sun/star/text/XParagraphAppend.idl
index 0b09c7971b49..040c83a12d4e 100644
--- a/offapi/com/sun/star/text/XParagraphAppend.idl
+++ b/offapi/com/sun/star/text/XParagraphAppend.idl
@@ -27,25 +27,13 @@
#ifndef __com_sun_star_text_XParagraphAppend_idl__
#define __com_sun_star_text_XParagraphAppend_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XParagraphCursor.idl b/offapi/com/sun/star/text/XParagraphCursor.idl
index 7e83557674f2..0865de948c93 100644
--- a/offapi/com/sun/star/text/XParagraphCursor.idl
+++ b/offapi/com/sun/star/text/XParagraphCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XParagraphCursor_idl__
#define __com_sun_star_text_XParagraphCursor_idl__
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XRedline.idl b/offapi/com/sun/star/text/XRedline.idl
index e11607871f21..e2cb1af6cfa7 100644
--- a/offapi/com/sun/star/text/XRedline.idl
+++ b/offapi/com/sun/star/text/XRedline.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_XRedline_idl__
#define __com_sun_star_text_XRedline_idl__
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
index dae6f4963e14..9f015819ce3e 100644
--- a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
+++ b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
#define __com_sun_star_text_XReferenceMarksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
index c180e145a47f..b4a74684704b 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_XRelativeTextContentInsert_idl__
#define __com_sun_star_text_XRelativeTextContentInsert_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
index bb4bc79ef8a8..e9450dd3780c 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_XRelativeTextContentRemove_idl__
#define __com_sun_star_text_XRelativeTextContentRemove_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XRubySelection.idl b/offapi/com/sun/star/text/XRubySelection.idl
index 156f501ec4ba..e583f93045ec 100644
--- a/offapi/com/sun/star/text/XRubySelection.idl
+++ b/offapi/com/sun/star/text/XRubySelection.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_text_XRubySelection_idl__
#define __com_sun_star_text_XRubySelection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
diff --git a/offapi/com/sun/star/text/XSentenceCursor.idl b/offapi/com/sun/star/text/XSentenceCursor.idl
index af9534972b69..e10f24680704 100644
--- a/offapi/com/sun/star/text/XSentenceCursor.idl
+++ b/offapi/com/sun/star/text/XSentenceCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XSentenceCursor_idl__
#define __com_sun_star_text_XSentenceCursor_idl__
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index f39c8ab334ab..24a7f245c46e 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_text_XSimpleText_idl__
#define __com_sun_star_text_XSimplText_idl__
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XText.idl b/offapi/com/sun/star/text/XText.idl
index f0eee780802f..622345ed5924 100644
--- a/offapi/com/sun/star/text/XText.idl
+++ b/offapi/com/sun/star/text/XText.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_text_XText_idl__
#define __com_sun_star_text_XText_idl__
-#ifndef __com_sun_star_text_XSimpleText_idl__
#include <com/sun/star/text/XSimpleText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextAppend.idl b/offapi/com/sun/star/text/XTextAppend.idl
index 8e562fcf4ab3..14137136143b 100644
--- a/offapi/com/sun/star/text/XTextAppend.idl
+++ b/offapi/com/sun/star/text/XTextAppend.idl
@@ -28,15 +28,9 @@
#define __com_sun_star_text_XTextAppend_idl__
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextPortionAppend_idl__
#include <com/sun/star/text/XTextPortionAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XParagraphAppend_idl__
#include <com/sun/star/text/XParagraphAppend.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextAppendAndConvert.idl b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
index 48869f4303f8..1184a4750588 100644
--- a/offapi/com/sun/star/text/XTextAppendAndConvert.idl
+++ b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
@@ -28,15 +28,9 @@
#define __com_sun_star_text_XTextAppendAndConvert_idl__
-#ifndef __com_sun_star_text_XTextAppend_idl__
#include <com/sun/star/text/XTextAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContentAppend_idl__
#include <com/sun/star/text/XTextContentAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextConvert_idl__
#include <com/sun/star/text/XTextConvert.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextColumns.idl b/offapi/com/sun/star/text/XTextColumns.idl
index 8afc1c2cfceb..760bfc0e6be2 100644
--- a/offapi/com/sun/star/text/XTextColumns.idl
+++ b/offapi/com/sun/star/text/XTextColumns.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextColumns_idl__
#define __com_sun_star_text_XTextColumns_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_TextColumn_idl__
#include <com/sun/star/text/TextColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextContent.idl b/offapi/com/sun/star/text/XTextContent.idl
index ecc9c02d49c8..7166d9b7af1a 100644
--- a/offapi/com/sun/star/text/XTextContent.idl
+++ b/offapi/com/sun/star/text/XTextContent.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_XTextContent_idl__
#define __com_sun_star_text_XTextContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextContentAppend.idl b/offapi/com/sun/star/text/XTextContentAppend.idl
index 472e922a80f1..8a32527ebf79 100644
--- a/offapi/com/sun/star/text/XTextContentAppend.idl
+++ b/offapi/com/sun/star/text/XTextContentAppend.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_text_XTextContentAppend_idl__
#define __com_sun_star_text_XTextContentAppend_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextConvert.idl b/offapi/com/sun/star/text/XTextConvert.idl
index 1f643bc0d1c4..4a118209f677 100644
--- a/offapi/com/sun/star/text/XTextConvert.idl
+++ b/offapi/com/sun/star/text/XTextConvert.idl
@@ -27,31 +27,14 @@
#ifndef __com_sun_star_text_XTextConvert_idl__
#define __com_sun_star_text_XTextConvert_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextTable_idl__
#include <com/sun/star/text/XTextTable.idl>
-#endif
diff --git a/offapi/com/sun/star/text/XTextCopy.idl b/offapi/com/sun/star/text/XTextCopy.idl
index 5e1d91e5e82d..af3a6aa3c0ec 100644
--- a/offapi/com/sun/star/text/XTextCopy.idl
+++ b/offapi/com/sun/star/text/XTextCopy.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XText_idl__
#define __com_sun_star_text_XText_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextCursor.idl b/offapi/com/sun/star/text/XTextCursor.idl
index eda255e16ea5..f716f6a8d4c6 100644
--- a/offapi/com/sun/star/text/XTextCursor.idl
+++ b/offapi/com/sun/star/text/XTextCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XTextCursor_idl__
#define __com_sun_star_text_XTextCursor_idl__
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextDocument.idl b/offapi/com/sun/star/text/XTextDocument.idl
index c1d8d04ed4ce..536285d8120e 100644
--- a/offapi/com/sun/star/text/XTextDocument.idl
+++ b/offapi/com/sun/star/text/XTextDocument.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextDocument_idl__
#define __com_sun_star_text_XTextDocument_idl__
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
index c11d16f22969..f83d3ccde96e 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextEmbeddedObject_idl__
#define __com_sun_star_text_XTextEmbeddedObject_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
index 93c12aa1ad2d..6f5146acb3a4 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
#define __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextField.idl b/offapi/com/sun/star/text/XTextField.idl
index 08060bef9d61..55a3d73479bd 100644
--- a/offapi/com/sun/star/text/XTextField.idl
+++ b/offapi/com/sun/star/text/XTextField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XTextField_idl__
#define __com_sun_star_text_XTextField_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFieldsSupplier.idl b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
index 14f0fc79569c..97e49f880a4e 100644
--- a/offapi/com/sun/star/text/XTextFieldsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
#define __com_sun_star_text_XTextFieldsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFrame.idl b/offapi/com/sun/star/text/XTextFrame.idl
index 0435e60cb86c..0c7772d96ede 100644
--- a/offapi/com/sun/star/text/XTextFrame.idl
+++ b/offapi/com/sun/star/text/XTextFrame.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_text_XTextFrame_idl__
#define __com_sun_star_text_XTextFrame_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFramesSupplier.idl b/offapi/com/sun/star/text/XTextFramesSupplier.idl
index ae7b3bf65f1e..a6120f70e6ec 100644
--- a/offapi/com/sun/star/text/XTextFramesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFramesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextFramesSupplier_idl__
#define __com_sun_star_text_XTextFramesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
index 5320f80e1b48..9123f2ae8958 100644
--- a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
#define __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextMarkup.idl b/offapi/com/sun/star/text/XTextMarkup.idl
index 877e31c7377f..8a9bc4e4140a 100644
--- a/offapi/com/sun/star/text/XTextMarkup.idl
+++ b/offapi/com/sun/star/text/XTextMarkup.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_text_XTextMarkup_idl__
#define __com_sun_star_text_XTextMarkup_idl__
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
#include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
#include <com/sun/star/text/TextMarkupType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl b/offapi/com/sun/star/text/XTextPortionAppend.idl
index 84b121163e72..a09b167cd94d 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_text_XTextPortionAppend_idl__
#define __com_sun_star_text_XTextPortionAppend_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextRange.idl b/offapi/com/sun/star/text/XTextRange.idl
index 58a59b33b09e..34cacc306190 100644
--- a/offapi/com/sun/star/text/XTextRange.idl
+++ b/offapi/com/sun/star/text/XTextRange.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XTextRange_idl__
#define __com_sun_star_text_XTextRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextRangeCompare.idl b/offapi/com/sun/star/text/XTextRangeCompare.idl
index 5f15feab1905..7d87a18c2619 100644
--- a/offapi/com/sun/star/text/XTextRangeCompare.idl
+++ b/offapi/com/sun/star/text/XTextRangeCompare.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextRangeCompare_idl__
#define __com_sun_star_text_XTextRangeCompare_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextRangeMover.idl b/offapi/com/sun/star/text/XTextRangeMover.idl
index 59381de38854..0220e01aea04 100644
--- a/offapi/com/sun/star/text/XTextRangeMover.idl
+++ b/offapi/com/sun/star/text/XTextRangeMover.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextRangeMover_idl__
#define __com_sun_star_text_XTextRangeMover_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextSection.idl b/offapi/com/sun/star/text/XTextSection.idl
index 2a35e2bf0edb..e2544488e080 100644
--- a/offapi/com/sun/star/text/XTextSection.idl
+++ b/offapi/com/sun/star/text/XTextSection.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XTextSection_idl__
#define __com_sun_star_text_XTextSection_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextSectionsSupplier.idl b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
index 0425534c275b..15e96e52f6a4 100644
--- a/offapi/com/sun/star/text/XTextSectionsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
#define __com_sun_star_text_XTextSectionsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextShapesSupplier.idl b/offapi/com/sun/star/text/XTextShapesSupplier.idl
index 838e74a00110..48b4b88bdeb7 100644
--- a/offapi/com/sun/star/text/XTextShapesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextShapesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextShapesSupplier_idl__
#define __com_sun_star_text_XTextShapesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTable.idl b/offapi/com/sun/star/text/XTextTable.idl
index 44b18be77648..9042e4d6dd61 100644
--- a/offapi/com/sun/star/text/XTextTable.idl
+++ b/offapi/com/sun/star/text/XTextTable.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_text_XTextTable_idl__
#define __com_sun_star_text_XTextTable_idl__
-#ifndef __com_sun_star_text_XTextContent_idl__
#include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_table_XTableRows_idl__
#include <com/sun/star/table/XTableRows.idl>
-#endif
-#ifndef __com_sun_star_table_XTableColumns_idl__
#include <com/sun/star/table/XTableColumns.idl>
-#endif
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
#include <com/sun/star/text/XTextTableCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTableCursor.idl b/offapi/com/sun/star/text/XTextTableCursor.idl
index 570160fcaf7f..d88b45f9b99a 100644
--- a/offapi/com/sun/star/text/XTextTableCursor.idl
+++ b/offapi/com/sun/star/text/XTextTableCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XTextTableCursor_idl__
#define __com_sun_star_text_XTextTableCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTablesSupplier.idl b/offapi/com/sun/star/text/XTextTablesSupplier.idl
index b1c192ccd316..593ca0fe74ef 100644
--- a/offapi/com/sun/star/text/XTextTablesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextTablesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
#define __com_sun_star_text_XTextTablesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextViewCursor.idl b/offapi/com/sun/star/text/XTextViewCursor.idl
index b06b8bfbb481..5345df4d99e0 100644
--- a/offapi/com/sun/star/text/XTextViewCursor.idl
+++ b/offapi/com/sun/star/text/XTextViewCursor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextViewCursor_idl__
#define __com_sun_star_text_XTextViewCursor_idl__
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
index 55f66b58395b..822df600cec2 100644
--- a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
+++ b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
#define __com_sun_star_text_XTextViewCursorSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XTextViewCursor_idl__
#include <com/sun/star/text/XTextViewCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/XWordCursor.idl b/offapi/com/sun/star/text/XWordCursor.idl
index 89da3ed370c0..adfdfe356567 100644
--- a/offapi/com/sun/star/text/XWordCursor.idl
+++ b/offapi/com/sun/star/text/XWordCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_text_XWordCursor_idl__
#define __com_sun_star_text_XWordCursor_idl__
-#ifndef __com_sun_star_text_XTextCursor_idl__
#include <com/sun/star/text/XTextCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index d98c4be39e96..f5f6aa585aa3 100644
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_text_textfield_MetadataField_idl__
#define __com_sun_star_text_textfield_MetadataField_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextField_idl__
#include <com/sun/star/text/TextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
#include <com/sun/star/rdf/XMetadatable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
index 56902f637599..ed036e1e4bc0 100644
--- a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
+++ b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
#define __com_sun_star_ucb_AlreadyInitializedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
index 2e0d3542668c..ec945353a981 100644
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_AnyCompareFactory_idl__
#define __com_sun_star_ucb_AnyCompareFactory_idl__
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
#include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/AuthenticationRequest.idl b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
index 3a841b9f4d10..0c8cc4df0164 100644
--- a/offapi/com/sun/star/ucb/AuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
#define __com_sun_star_ucb_AuthenticationRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
index fc53292963c1..6bb47a1df513 100644
--- a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
+++ b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_CHAOSProgressStart_idl__
#define __com_sun_star_ucb_CHAOSProgressStart_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSet.idl b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
index bf0dc8a5e60c..12bf224c0270 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_CachedContentResultSet_idl__
#define __com_sun_star_ucb_CachedContentResultSet_idl__
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
#include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
index ab03429e7f84..b6d53f778361 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_CachedContentResultSetFactory_idl__
#define __com_sun_star_ucb_CachedContentResultSetFactory_idl__
-#ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
#include <com/sun/star/ucb/XCachedContentResultSetFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
index 5d2a4ed61956..a8aafcf7ac71 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_CachedContentResultSetStub_idl__
#define __com_sun_star_ucb_CachedContentResultSetStub_idl__
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
#include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProvider_idl__
#include <com/sun/star/ucb/XFetchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
#include <com/sun/star/ucb/XFetchProviderForContentAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
index cbfff8944311..e3a77c3c8d08 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
#define __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
-#ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
#include <com/sun/star/ucb/XCachedContentResultSetStubFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
index a6116d1db1a8..e0bdaf9cb5cc 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_CachedDynamicResultSet_idl__
#define __com_sun_star_ucb_CachedDynamicResultSet_idl__
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
#include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
index 5ec157e15015..962a1f5b2feb 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
#define __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
#include <com/sun/star/ucb/XCachedDynamicResultSetFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
index 7037eafb9e91..d5ae75de0d8c 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
#define __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
#include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
index e0357c3ee61b..642bf1833194 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
#define __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
#include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
index 182fe5f8e641..658db1628cba 100644
--- a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
+++ b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_CertificateValidationRequest_idl__
#define __com_sun_star_ucb_CertificateValidationRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_security_XCertificate_idl__
#include <com/sun/star/security/XCertificate.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Command.idl b/offapi/com/sun/star/ucb/Command.idl
index 9d39c3a3525e..36bb1ebc4efc 100644
--- a/offapi/com/sun/star/ucb/Command.idl
+++ b/offapi/com/sun/star/ucb/Command.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_Command_idl__
#define __com_sun_star_ucb_Command_idl__
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
#include <com/sun/star/ucb/CommandInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandAbortedException.idl b/offapi/com/sun/star/ucb/CommandAbortedException.idl
index a7fac87d48b3..769dca5709bc 100644
--- a/offapi/com/sun/star/ucb/CommandAbortedException.idl
+++ b/offapi/com/sun/star/ucb/CommandAbortedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
#define __com_sun_star_ucb_CommandAbortedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandFailedException.idl b/offapi/com/sun/star/ucb/CommandFailedException.idl
index 5f123ed70430..4934bc89c4c3 100644
--- a/offapi/com/sun/star/ucb/CommandFailedException.idl
+++ b/offapi/com/sun/star/ucb/CommandFailedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_CommandFailedException_idl__
#define __com_sun_star_ucb_CommandFailedException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandInfo.idl b/offapi/com/sun/star/ucb/CommandInfo.idl
index aa4c07c5519f..3eb5237cfb8f 100644
--- a/offapi/com/sun/star/ucb/CommandInfo.idl
+++ b/offapi/com/sun/star/ucb/CommandInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_CommandInfo_idl__
#define __com_sun_star_ucb_CommandInfo_idl__
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
index 60cd2a06a847..231f85541385 100644
--- a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
#define __com_sun_star_ucb_CommandInfoChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index db42e9dc73f1..084e464efac0 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_ucb_Content_idl__
#define __com_sun_star_ucb_Content_idl__
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentCreationException.idl b/offapi/com/sun/star/ucb/ContentCreationException.idl
index fdeca8a1c772..62f10e3e6c71 100644
--- a/offapi/com/sun/star/ucb/ContentCreationException.idl
+++ b/offapi/com/sun/star/ucb/ContentCreationException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_ContentCreationException_idl__
#define __com_sun_star_ucb_ContentCreationException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentCreationError_idl__
#include <com/sun/star/ucb/ContentCreationError.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentEvent.idl b/offapi/com/sun/star/ucb/ContentEvent.idl
index 8d69bfb3d23e..b0753e547f24 100644
--- a/offapi/com/sun/star/ucb/ContentEvent.idl
+++ b/offapi/com/sun/star/ucb/ContentEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ContentEvent_idl__
#define __com_sun_star_ucb_ContentEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentInfo.idl b/offapi/com/sun/star/ucb/ContentInfo.idl
index f562d8f39670..c19aa6747fc5 100644
--- a/offapi/com/sun/star/ucb/ContentInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ContentInfo_idl__
#define __com_sun_star_ucb_ContentInfo_idl__
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProvider.idl b/offapi/com/sun/star/ucb/ContentProvider.idl
index 314b4f7c858d..55e427737d86 100644
--- a/offapi/com/sun/star/ucb/ContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ContentProvider.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_ucb_ContentProvider_idl__
#define __com_sun_star_ucb_ContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
#include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
#include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
#include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProviderInfo.idl b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
index 1c39ff7929f8..bf863e0270b2 100644
--- a/offapi/com/sun/star/ucb/ContentProviderInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
#define __com_sun_star_ucb_ContentProviderInfo_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxy.idl b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
index e84e28ee10ef..cb97a41c2082 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxy.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_ContentProviderProxy_idl__
#define __com_sun_star_ucb_ContentProviderProxy_idl__
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
#include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
#include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
index adc63748b95f..80f98dbcd329 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ContentProviderProxyFactory_idl__
#define __com_sun_star_ucb_ContentProviderProxyFactory_idl__
-#ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
#include <com/sun/star/ucb/XContentProviderFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentResultSet.idl b/offapi/com/sun/star/ucb/ContentResultSet.idl
index d0d10fb9b88c..dd004dd46be6 100644
--- a/offapi/com/sun/star/ucb/ContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/ContentResultSet.idl
@@ -27,37 +27,14 @@
#ifndef __com_sun_star_ucb_ContentResultSet_idl__
#define __com_sun_star_ucb_ContentResultSet_idl__
-#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_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XRow_idl__
#include <com/sun/star/sdbc/XRow.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
#include <com/sun/star/sdbc/XCloseable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentAccess_idl__
#include <com/sun/star/ucb/XContentAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentTransmitter.idl b/offapi/com/sun/star/ucb/ContentTransmitter.idl
index 7691dcf91036..f0b5fee2e7be 100644
--- a/offapi/com/sun/star/ucb/ContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/ContentTransmitter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ContentTransmitter_idl__
#define __com_sun_star_ucb_ContentTransmitter_idl__
-#ifndef __com_sun_star_ucb_XContentTransmitter_idl__
#include <com/sun/star/ucb/XContentTransmitter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Cookie.idl b/offapi/com/sun/star/ucb/Cookie.idl
index 0c413322dd76..6263b84bf7d5 100644
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ b/offapi/com/sun/star/ucb/Cookie.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_Cookie_idl__
#define __com_sun_star_ucb_Cookie_idl__
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
#include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
index b2f3af2c01b7..5965f464681d 100644
--- a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
#define __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
-#ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
#include <com/sun/star/ucb/HierarchyDataSource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
index fb6153644e0e..8cbac473b5a2 100644
--- a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
#define __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/DuplicateProviderException.idl b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
index 1cade82f18e0..d283c49d542c 100644
--- a/offapi/com/sun/star/ucb/DuplicateProviderException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
#define __com_sun_star_ucb_DuplicateProviderException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/DynamicResultSet.idl b/offapi/com/sun/star/ucb/DynamicResultSet.idl
index 637d15ab814a..88eee5bb1422 100644
--- a/offapi/com/sun/star/ucb/DynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/DynamicResultSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_DynamicResultSet_idl__
#define __com_sun_star_ucb_DynamicResultSet_idl__
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ExportStreamInfo.idl b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
index bf8f2b59bc3d..763622d7bfa1 100644
--- a/offapi/com/sun/star/ucb/ExportStreamInfo.idl
+++ b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ExportStreamInfo_idl__
#define __com_sun_star_ucb_ExportStreamInfo_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/FTPContent.idl b/offapi/com/sun/star/ucb/FTPContent.idl
index b72ef1d660cd..cfd1b33864c4 100644
--- a/offapi/com/sun/star/ucb/FTPContent.idl
+++ b/offapi/com/sun/star/ucb/FTPContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_FTPContent_idl__
#define __com_sun_star_ucb_FTPContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
index dd1a6e8aea09..5432891d3084 100644
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FTPContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_FTPContentProvider_idl__
#define __com_sun_star_ucb_FTPContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/FileContent.idl b/offapi/com/sun/star/ucb/FileContent.idl
index 7dfd2d7439ca..5351f5363f39 100644
--- a/offapi/com/sun/star/ucb/FileContent.idl
+++ b/offapi/com/sun/star/ucb/FileContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_FileContent_idl__
#define __com_sun_star_ucb_FileContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/FileContentProvider.idl b/offapi/com/sun/star/ucb/FileContentProvider.idl
index 83162add4c0e..7c7cb43de7f3 100644
--- a/offapi/com/sun/star/ucb/FileContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FileContentProvider.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ucb_FileContentProvider_idl__
#define __com_sun_star_ucb_FileContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-#ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
#include <com/sun/star/ucb/XFileIdentifierConverter.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
#include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/FolderList.idl b/offapi/com/sun/star/ucb/FolderList.idl
index 0966639725cf..a33963e88e56 100644
--- a/offapi/com/sun/star/ucb/FolderList.idl
+++ b/offapi/com/sun/star/ucb/FolderList.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_FolderList_idl__
#define __com_sun_star_ucb_FolderList_idl__
-#ifndef __com_sun_star_ucb_FolderListCommand_idl__
#include <com/sun/star/ucb/FolderListCommand.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FolderListEntry_idl__
#include <com/sun/star/ucb/FolderListEntry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/GIOContentProvider.idl b/offapi/com/sun/star/ucb/GIOContentProvider.idl
index 356fd6a5c246..d6823c9cfe82 100644
--- a/offapi/com/sun/star/ucb/GIOContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GIOContentProvider.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_ucb_GIOContentProvider_idl__
#define __com_sun_star_ucb_GIOContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
module com { module sun { module star { module ucb {
service GIOContentProvider
diff --git a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
index 65b479bb3c55..7ffaa5445bc5 100644
--- a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
#define __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
-#ifndef __com_sun_star_ucb_TransferCommandOperation_idl__
#include <com/sun/star/ucb/TransferCommandOperation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
index 2e6276dca63d..cd6070a007ed 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_ucb_GnomeVFSContentProvider_idl__
#define __com_sun_star_ucb_GnomeVFSContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
index 4cda47bc34bf..eaf4171ae4b6 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
@@ -1,41 +1,15 @@
#ifndef __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
#define __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
index fe105e2f4034..86917ad834b6 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
@@ -1,45 +1,16 @@
#ifndef __com_sun_star_ucb_GnomeVFSFolderContent_idl__
#define __com_sun_star_ucb_GnomeVFSFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
index 50dbac15ef0b..d7ecb255e710 100644
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_HandleCookiesRequest_idl__
#define __com_sun_star_ucb_HandleCookiesRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
#include <com/sun/star/ucb/Cookie.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookieRequest_idl__
#include <com/sun/star/ucb/CookieRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HelpContent.idl b/offapi/com/sun/star/ucb/HelpContent.idl
index 2dca8b8cf8b1..98e42ded97d1 100644
--- a/offapi/com/sun/star/ucb/HelpContent.idl
+++ b/offapi/com/sun/star/ucb/HelpContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_HelpContent_idl__
#define __com_sun_star_ucb_HelpContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HelpContentProvider.idl b/offapi/com/sun/star/ucb/HelpContentProvider.idl
index 32b51431436a..06146fb00d65 100644
--- a/offapi/com/sun/star/ucb/HelpContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HelpContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_HelpContentProvider_idl__
#define __com_sun_star_ucb_HelpContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
index f5a975ed58b6..6510b9200a06 100644
--- a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_HierarchyContentProvider_idl__
#define __com_sun_star_ucb_HierarchyContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
index af02206536a0..c3920aff0417 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
#define __com_sun_star_ucb_HierarchyDataReadAccess_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
#include <com/sun/star/util/XChangesNotifier.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
index d9d6e270fbee..add81ec6cd2e 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
#define __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
-#ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
#include <com/sun/star/ucb/HierarchyDataReadAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesBatch_idl__
#include <com/sun/star/util/XChangesBatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyDataSource.idl b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
index 112f6295b4cd..3841b887054a 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
#define __com_sun_star_ucb_HierarchyDataSource_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
index 5db255975cae..f65e936180f1 100644
--- a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_HierarchyFolderContent_idl__
#define __com_sun_star_ucb_HierarchyFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
index 53769e310488..fe81a3581c4e 100644
--- a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_HierarchyLinkContent_idl__
#define __com_sun_star_ucb_HierarchyLinkContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
index 3ef8c59bc24a..0c285be49a2b 100644
--- a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_HierarchyRootFolderContent_idl__
#define __com_sun_star_ucb_HierarchyRootFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
index d0dc33dbcd5c..b1a500a1b83a 100644
--- a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
#define __com_sun_star_ucb_IllegalIdentifierException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InsertCommandArgument.idl b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
index c8950ac87113..c6f5ca077884 100644
--- a/offapi/com/sun/star/ucb/InsertCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_InsertCommandArgument_idl__
#define __com_sun_star_ucb_InsertCommandArgument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
index 5e75721b7cec..0c97970a6f9d 100644
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAppException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
#define __com_sun_star_ucb_InteractiveIOException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
#include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
index 0949078f15f9..2e18f3517fe4 100644
--- a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
#define __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
#include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
index 37e3f09ae4c2..d30559c057c4 100644
--- a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
#define __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
index 52e70e320e0a..56af2c02abd4 100644
--- a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveCHAOSException_idl__
#define __com_sun_star_ucb_InteractiveCHAOSException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
index a09872f6dda2..11b2029fef55 100644
--- a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_InteractiveFileIOException_idl__
#define __com_sun_star_ucb_InteractiveFileIOException_idl__
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
#include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
#include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveIOException.idl b/offapi/com/sun/star/ucb/InteractiveIOException.idl
index ef66bd57488a..94a6c74a6df8 100644
--- a/offapi/com/sun/star/ucb/InteractiveIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveIOException.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
#define __com_sun_star_ucb_InteractiveIOException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
#include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingException.idl b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
index 8dc6444ef446..1a5f49a66b14 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
#define __com_sun_star_ucb_InteractiveLockingException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
index b47d4f55c3d1..c1e1cc421f4c 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
#define __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
#include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
index da243c4d2bbe..636035f953dd 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveLockingLockedException_idl__
#define __com_sun_star_ucb_InteractiveLockingLockedException_idl__
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
#include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
index 061df935867d..592094458a57 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
#define __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
#include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
index 2548022009b8..4550bba45560 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
#define __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
index deb741724ca1..958a0b29f705 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#define __com_sun_star_ucb_InteractiveNetworkException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
index a71e295aea17..a172d426c3c4 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
#define __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
index a65d9115c63d..7b4809c05dcb 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
#define __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
index d531d0781d5e..81dba3052169 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkReadException_idl__
#define __com_sun_star_ucb_InteractiveNetworkReadException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
index 8bdf16deed00..ccfc9c640900 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
#define __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
index 56d8b5881b71..bd6d76c1e79a 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
#define __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
#include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
index f3757b17b7fa..91abadd20210 100644
--- a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_InteractiveWrongMediumException_idl__
#define __com_sun_star_ucb_InteractiveWrongMediumException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ListEvent.idl b/offapi/com/sun/star/ucb/ListEvent.idl
index 6b5554e8d0ac..fb718391661f 100644
--- a/offapi/com/sun/star/ucb/ListEvent.idl
+++ b/offapi/com/sun/star/ucb/ListEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_ListEvent_idl__
#define __com_sun_star_ucb_ListEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListAction_idl__
#include <com/sun/star/ucb/ListAction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
index 5c279f974f94..6f43258a8a61 100644
--- a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
+++ b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
#define __com_sun_star_ucb_ListenerAlreadySetException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Lock.idl b/offapi/com/sun/star/ucb/Lock.idl
index ce432234d4f2..429fdf0b81b5 100644
--- a/offapi/com/sun/star/ucb/Lock.idl
+++ b/offapi/com/sun/star/ucb/Lock.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_Lock_idl__
#define __com_sun_star_ucb_Lock_idl__
-#ifndef __com_sun_star_ucb_LockEntry_idl__
#include <com/sun/star/ucb/LockEntry.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockDepth_idl__
#include <com/sun/star/ucb/LockDepth.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/LockEntry.idl b/offapi/com/sun/star/ucb/LockEntry.idl
index be348e09a08b..c1c5f049d5c6 100644
--- a/offapi/com/sun/star/ucb/LockEntry.idl
+++ b/offapi/com/sun/star/ucb/LockEntry.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_LockEntry_idl__
#define __com_sun_star_ucb_LockEntry_idl__
-#ifndef __com_sun_star_ucb_LockScope_idl__
#include <com/sun/star/ucb/LockScope.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockType_idl__
#include <com/sun/star/ucb/LockType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/MissingInputStreamException.idl b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
index 3d57ab90686e..a9d9c146af31 100644
--- a/offapi/com/sun/star/ucb/MissingInputStreamException.idl
+++ b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_MissingInputStreamException_idl__
#define __com_sun_star_ucb_MissingInputStreamException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/MissingPropertiesException.idl b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
index ef2f1e67a053..ae3aff1aa892 100644
--- a/offapi/com/sun/star/ucb/MissingPropertiesException.idl
+++ b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_MissingPropertiesException_idl__
#define __com_sun_star_ucb_MissingPropertiesException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/NameClashException.idl b/offapi/com/sun/star/ucb/NameClashException.idl
index e3cbedcb4d4c..490e90a540fd 100644
--- a/offapi/com/sun/star/ucb/NameClashException.idl
+++ b/offapi/com/sun/star/ucb/NameClashException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_NameClashException_idl__
#define __com_sun_star_ucb_NameClashException_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
index 024eb9ab8547..f2523bfa7f2f 100644
--- a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
+++ b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_NameClashResolveRequest_idl__
#define __com_sun_star_ucb_NameClashResolveRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ODMAContent.idl b/offapi/com/sun/star/ucb/ODMAContent.idl
index b74f8be34956..23c44d66da0f 100644
--- a/offapi/com/sun/star/ucb/ODMAContent.idl
+++ b/offapi/com/sun/star/ucb/ODMAContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_ODMAContent_idl__
#define __com_sun_star_ucb_ODMAContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
index 4dae85968ba1..da67f01ae5bd 100644
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ODMAContentProvider_idl__
#define __com_sun_star_ucb_ODMAContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument.idl b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
index c09241aa5728..69911e6a9eaf 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
#define __com_sun_star_ucb_OpenCommandArgument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
index 085ed2efc762..5df59675c931 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_OpenCommandArgument2_idl__
#define __com_sun_star_ucb_OpenCommandArgument2_idl__
-#ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
#include <com/sun/star/ucb/OpenCommandArgument.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
#include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PackageContentProvider.idl b/offapi/com/sun/star/ucb/PackageContentProvider.idl
index 1c3ae69b47a9..4fd8dfe78f2e 100644
--- a/offapi/com/sun/star/ucb/PackageContentProvider.idl
+++ b/offapi/com/sun/star/ucb/PackageContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_PackageContentProvider_idl__
#define __com_sun_star_ucb_PackageContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PackageFolderContent.idl b/offapi/com/sun/star/ucb/PackageFolderContent.idl
index 13668bc54ea6..78500e5fb1d9 100644
--- a/offapi/com/sun/star/ucb/PackageFolderContent.idl
+++ b/offapi/com/sun/star/ucb/PackageFolderContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_PackageFolderContent_idl__
#define __com_sun_star_ucb_PackageFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PackageStreamContent.idl b/offapi/com/sun/star/ucb/PackageStreamContent.idl
index abe188da4db7..8a923cf355d4 100644
--- a/offapi/com/sun/star/ucb/PackageStreamContent.idl
+++ b/offapi/com/sun/star/ucb/PackageStreamContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_PackageStreamContent_idl__
#define __com_sun_star_ucb_PackageStreamContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PersistentPropertySet.idl b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
index 02a531e5c5e2..f0403c9cefa6 100644
--- a/offapi/com/sun/star/ucb/PersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ucb_PersistentPropertySet_idl__
#define __com_sun_star_ucb_PersistentPropertySet_idl__
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
#include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument.idl b/offapi/com/sun/star/ucb/PostCommandArgument.idl
index c1c04c237af4..eb2b3aab040f 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_PostCommandArgument_idl__
#define __com_sun_star_ucb_PostCommandArgument_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument2.idl b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
index b260384bb1bd..ea92d7943674 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_PostCommandArgument2_idl__
#define __com_sun_star_ucb_PostCommandArgument2_idl__
-#ifndef __com_sun_star_ucb_PostCommandArgument_idl__
#include <com/sun/star/ucb/PostCommandArgument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PropertiesManager.idl b/offapi/com/sun/star/ucb/PropertiesManager.idl
index 4d0d992a33a5..09137b171329 100644
--- a/offapi/com/sun/star/ucb/PropertiesManager.idl
+++ b/offapi/com/sun/star/ucb/PropertiesManager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_PropertiesManager_idl__
#define __com_sun_star_ucb_PropertiesManager_idl__
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PropertySetRegistry.idl b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
index 097495732497..6f5199b178b2 100644
--- a/offapi/com/sun/star/ucb/PropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_PropertySetRegistry_idl__
#define __com_sun_star_ucb_PropertySetRegistry_idl__
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
#include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/PropertyValueInfo.idl b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
index 1c55113e1eaa..5d93a7b53be9 100644
--- a/offapi/com/sun/star/ucb/PropertyValueInfo.idl
+++ b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_PropertyValueInfo_idl__
#define __com_sun_star_ucb_PropertyValueInfo_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_PropertyValueState_idl__
#include <com/sun/star/ucb/PropertyValueState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/RecipientInfo.idl b/offapi/com/sun/star/ucb/RecipientInfo.idl
index fe8f7d5d3a6b..4e0d70a04ca2 100644
--- a/offapi/com/sun/star/ucb/RecipientInfo.idl
+++ b/offapi/com/sun/star/ucb/RecipientInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_RecipientInfo_idl__
#define __com_sun_star_ucb_RecipientInfo_idl__
-#ifndef __com_sun_star_ucb_OutgoingMessageState_idl__
#include <com/sun/star/ucb/OutgoingMessageState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
index 2a0f84a5737f..c1a3caf4c889 100644
--- a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_RemoteAccessContentProvider_idl__
#define __com_sun_star_ucb_RemoteAccessContentProvider_idl__
-#ifndef __com_sun_star_ucb_ContentProvider_idl__
#include <com/sun/star/ucb/ContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
#include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
index ddf2c668763d..648729473b09 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
#define __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeAction_idl__
#include <com/sun/star/ucb/RemoteContentProviderChangeAction.idl>
-#endif
module com { module sun { module star { module ucb {
diff --git a/offapi/com/sun/star/ucb/ResultSetException.idl b/offapi/com/sun/star/ucb/ResultSetException.idl
index 7e207d96867b..8e49a1df125a 100644
--- a/offapi/com/sun/star/ucb/ResultSetException.idl
+++ b/offapi/com/sun/star/ucb/ResultSetException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ResultSetException_idl__
#define __com_sun_star_ucb_ResultSetException_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Rule.idl b/offapi/com/sun/star/ucb/Rule.idl
index 7e2649d2bec2..acfc868b641e 100644
--- a/offapi/com/sun/star/ucb/Rule.idl
+++ b/offapi/com/sun/star/ucb/Rule.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_Rule_idl__
#define __com_sun_star_ucb_Rule_idl__
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
#include <com/sun/star/ucb/RuleTerm.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/RuleSet.idl b/offapi/com/sun/star/ucb/RuleSet.idl
index 85afeb89dc08..182a469ad53c 100644
--- a/offapi/com/sun/star/ucb/RuleSet.idl
+++ b/offapi/com/sun/star/ucb/RuleSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_RuleSet_idl__
#define __com_sun_star_ucb_RuleSet_idl__
-#ifndef __com_sun_star_ucb_Rule_idl__
#include <com/sun/star/ucb/Rule.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchCommandArgument.idl b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
index 47353803dfa0..a7547bd6c104 100644
--- a/offapi/com/sun/star/ucb/SearchCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_SearchCommandArgument_idl__
#define __com_sun_star_ucb_SearchCommandArgument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchInfo_idl__
#include <com/sun/star/ucb/SearchInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchCriterium.idl b/offapi/com/sun/star/ucb/SearchCriterium.idl
index 287199ee9e02..b523f9350454 100644
--- a/offapi/com/sun/star/ucb/SearchCriterium.idl
+++ b/offapi/com/sun/star/ucb/SearchCriterium.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_SearchCriterium_idl__
#define __com_sun_star_ucb_SearchCriterium_idl__
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
#include <com/sun/star/ucb/RuleTerm.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchInfo.idl b/offapi/com/sun/star/ucb/SearchInfo.idl
index 5137db204c5c..fd246fa9cd83 100644
--- a/offapi/com/sun/star/ucb/SearchInfo.idl
+++ b/offapi/com/sun/star/ucb/SearchInfo.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_SearchInfo_idl__
#define __com_sun_star_ucb_SearchInfo_idl__
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
#include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchRecursion_idl__
#include <com/sun/star/ucb/SearchRecursion.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
index e5780837b9bd..d63b55c485f9 100644
--- a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
+++ b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
#define __com_sun_star_ucb_ServiceNotFoundException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
index 4a1d69d2458d..25ec2d130107 100644
--- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_SimpleFileAccess_idl__
#define __com_sun_star_ucb_SimpleFileAccess_idl__
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
#include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
index d9ad5d7cb6e6..45a8f8a0486f 100644
--- a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
#define __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
-#ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/Store.idl b/offapi/com/sun/star/ucb/Store.idl
index 91ac7b118ba7..a6f2daf60a08 100644
--- a/offapi/com/sun/star/ucb/Store.idl
+++ b/offapi/com/sun/star/ucb/Store.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_Store_idl__
#define __com_sun_star_ucb_Store_idl__
-#ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
#include <com/sun/star/ucb/XPropertySetRegistryFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
index e3bb0d02a27c..27a7b47e6467 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
#define __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
index 54314f5bd24b..315599c77173 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
#define __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
index 68ad0be1f7bb..f55acd7e7500 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
#define __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
index 25c281392c4a..69a5d7cd46a6 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_TransientDocumentsRootContent_idl__
#define __com_sun_star_ucb_TransientDocumentsRootContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
index 7aaf3d4574db..34ecab40addc 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
#define __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 01d19a268a89..7bf6f143fcc7 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_URLAuthenticationRequest_idl__
#define __com_sun_star_ucb_URLAuthenticationRequest_idl__
-#ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
#include <com/sun/star/ucb/AuthenticationRequest.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/UniversalContentBroker.idl b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
index 515653b8a70a..3fc4d8eee1b8 100644
--- a/offapi/com/sun/star/ucb/UniversalContentBroker.idl
+++ b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_ucb_UniversalContentBroker_idl__
#define __com_sun_star_ucb_UniversalContentBroker_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
#include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
#include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
index 03431da57906..1ab6036ecac9 100644
--- a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
#define __com_sun_star_ucb_UnsupportedCommandException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
index c5762cf1f629..6c881fb5d529 100644
--- a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_ucb_UnsupportedDataSinkException_idl__
#define __com_sun_star_ucb_UnsupportedDataSinkException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
index b13cb7554791..aaee66ff310d 100644
--- a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_UnsupportedNameClashException_idl__
#define __com_sun_star_ucb_UnsupportedNameClashException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
index 15b966fe1649..bfd3e6d77670 100644
--- a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_UnsupportedOpenModeException_idl__
#define __com_sun_star_ucb_UnsupportedOpenModeException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
index 77fff16b5d24..2091497c56e3 100644
--- a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
+++ b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_WebDAVContentProvider_idl__
#define __com_sun_star_ucb_WebDAVContentProvider_idl__
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
index 7fbfd36ebdb9..0ee2e07a1493 100644
--- a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_WebDAVDocumentContent_idl__
#define __com_sun_star_ucb_WebDAVDocumentContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
index bc1b81171a99..63ec9fd83d21 100644
--- a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
@@ -27,45 +27,16 @@
#ifndef __com_sun_star_ucb_WebDAVFolderContent_idl__
#define __com_sun_star_ucb_WebDAVFolderContent_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
index b116d57bc908..053e62d55680 100644
--- a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
+++ b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
#define __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XAnyCompare.idl b/offapi/com/sun/star/ucb/XAnyCompare.idl
index 2e4be3419d63..dab6789299f6 100644
--- a/offapi/com/sun/star/ucb/XAnyCompare.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompare.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XAnyCompare_idl__
#define __com_sun_star_ucb_XAnyCompare_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
index 6356c846aa47..93f2525fee80 100644
--- a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
#define __com_sun_star_ucb_XAnyCompareFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompare_idl__
#include <com/sun/star/ucb/XAnyCompare.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
index dab5df76d6d6..aa7c64a4fcc3 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
#define __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
#include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
index 9a78bc2e0952..a11a83c83685 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
#define __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
index 57ef4a26d0fe..fb3ce003afc1 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
#define __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
#include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
index a8cd23d44a83..3cb0c705f9eb 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
#define __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
#include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
#include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandEnvironment.idl b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
index 35e1af812e60..6da80eb46a78 100644
--- a/offapi/com/sun/star/ucb/XCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
#define __com_sun_star_ucb_XCommandEnvironment_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XProgressHandler_idl__
#include <com/sun/star/ucb/XProgressHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandInfo.idl b/offapi/com/sun/star/ucb/XCommandInfo.idl
index 66798b7f3a4e..fa14abf07b99 100644
--- a/offapi/com/sun/star/ucb/XCommandInfo.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfo.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XCommandInfo_idl__
#define __com_sun_star_ucb_XCommandInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
#include <com/sun/star/ucb/CommandInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
#include <com/sun/star/ucb/UnsupportedCommandException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
index 3bd9012c5b4c..082646442914 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
#define __com_sun_star_ucb_XCommandInfoChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
#include <com/sun/star/ucb/CommandInfoChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
index 43379f86de83..2d7275e7bf5d 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
#define __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
#include <com/sun/star/ucb/XCommandInfoChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor.idl b/offapi/com/sun/star/ucb/XCommandProcessor.idl
index bfda2a07ec9f..5490c1a8595b 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#define __com_sun_star_ucb_XCommandProcessor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
#include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Command_idl__
#include <com/sun/star/ucb/Command.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
#include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor2.idl b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
index 657bb6db0f6d..314e46c890ba 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor2.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
#define __com_sun_star_ucb_XCommandProcessor2_idl__
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
module com { module sun { module star { module ucb {
diff --git a/offapi/com/sun/star/ucb/XContent.idl b/offapi/com/sun/star/ucb/XContent.idl
index 2be61f32ac56..7cf1dd0bd513 100644
--- a/offapi/com/sun/star/ucb/XContent.idl
+++ b/offapi/com/sun/star/ucb/XContent.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XContent_idl__
#define __com_sun_star_ucb_XContent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
#include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentEventListener_idl__
#include <com/sun/star/ucb/XContentEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentAccess.idl b/offapi/com/sun/star/ucb/XContentAccess.idl
index 8ead478e660f..a7758a3dff51 100644
--- a/offapi/com/sun/star/ucb/XContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XContentAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XContentAccess_idl__
#define __com_sun_star_ucb_XContentAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentCreator.idl b/offapi/com/sun/star/ucb/XContentCreator.idl
index 6dcc42b37471..bff4e1b072c0 100644
--- a/offapi/com/sun/star/ucb/XContentCreator.idl
+++ b/offapi/com/sun/star/ucb/XContentCreator.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XContentCreator_idl__
#define __com_sun_star_ucb_XContentCreator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentInfo_idl__
#include <com/sun/star/ucb/ContentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentEventListener.idl b/offapi/com/sun/star/ucb/XContentEventListener.idl
index 069f9c1012cc..f7b7c163db8e 100644
--- a/offapi/com/sun/star/ucb/XContentEventListener.idl
+++ b/offapi/com/sun/star/ucb/XContentEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XContentEventListener_idl__
#define __com_sun_star_ucb_XContentEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentEvent_idl__
#include <com/sun/star/ucb/ContentEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifier.idl b/offapi/com/sun/star/ucb/XContentIdentifier.idl
index 2b27915abd04..2bd500caee7b 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifier.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
#define __com_sun_star_ucb_XContentIdentifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
index 5a89d4e59087..5f771cd1feed 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
#define __com_sun_star_ucb_XContentIdentifierFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
#include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
index 59a7830f6571..953b459fbb10 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
#define __com_sun_star_ucb_XContentIdentifierMapping_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentProvider.idl b/offapi/com/sun/star/ucb/XContentProvider.idl
index 32b6f0ccad8c..f13ba15df8b5 100644
--- a/offapi/com/sun/star/ucb/XContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XContentProvider.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_ucb_XContentProvider_idl__
#define __com_sun_star_ucb_XContentProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
#include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
#include <com/sun/star/ucb/IllegalIdentifierException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentProviderFactory.idl b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
index 034be592ece0..8a88409ebe42 100644
--- a/offapi/com/sun/star/ucb/XContentProviderFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
#define __com_sun_star_ucb_XContentProviderFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentProviderManager.idl b/offapi/com/sun/star/ucb/XContentProviderManager.idl
index 01e0f9ded2fe..f7bbfee54c87 100644
--- a/offapi/com/sun/star/ucb/XContentProviderManager.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderManager.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
#define __com_sun_star_ucb_XContentProviderManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
#include <com/sun/star/ucb/DuplicateProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
#include <com/sun/star/ucb/ContentProviderInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
index cfa70cee5ddb..02ef214c8a2a 100644
--- a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
#define __com_sun_star_ucb_XContentProviderSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentTransmitter.idl b/offapi/com/sun/star/ucb/XContentTransmitter.idl
index 0ef1aace93cf..f28f989e3f5f 100644
--- a/offapi/com/sun/star/ucb/XContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/XContentTransmitter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XContentTransmitter_idl__
#define __com_sun_star_ucb_XContentTransmitter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDataContainer.idl b/offapi/com/sun/star/ucb/XDataContainer.idl
index 78437e0529a5..b4daa77232d4 100644
--- a/offapi/com/sun/star/ucb/XDataContainer.idl
+++ b/offapi/com/sun/star/ucb/XDataContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XDataContainer_idl__
#define __com_sun_star_ucb_XDataContainer_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSet.idl b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
index faab04c10796..a00d8fbf42c0 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#define __com_sun_star_ucb_XDynamicResultSet_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
#include <com/sun/star/ucb/XDynamicResultSetListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
#include <com/sun/star/ucb/ListenerAlreadySetException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
#include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
#include <com/sun/star/ucb/ServiceNotFoundException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
index 8e26afb116aa..ddd13eaa4606 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
#define __com_sun_star_ucb_XDynamicResultSetListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListEvent_idl__
#include <com/sun/star/ucb/ListEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XFetchProvider.idl b/offapi/com/sun/star/ucb/XFetchProvider.idl
index 96cce4ed59cc..b218f14b24c8 100644
--- a/offapi/com/sun/star/ucb/XFetchProvider.idl
+++ b/offapi/com/sun/star/ucb/XFetchProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XFetchProvider_idl__
#define __com_sun_star_ucb_XFetchProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
#include <com/sun/star/ucb/FetchResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
index 6573934c2f2b..00f29974d806 100644
--- a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
#define __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
#include <com/sun/star/ucb/FetchResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
index 7864cb272b12..befad440ebc9 100644
--- a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
+++ b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
#define __com_sun_star_ucb_XFileIdentifierConverter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index 8f41b6717edf..e9173ebf77d8 100644
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
#define __com_sun_star_ucb_XInteractionCookieHandling_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
#include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
#include <com/sun/star/ucb/Cookie.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
index a5ab34fc6af5..317f3e3af5a6 100644
--- a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
+++ b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
#define __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
index c5f03d720d49..293ade78637b 100644
--- a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
+++ b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
#define __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
index 42503756f468..2b45b4b664de 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
#define __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
#include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index 2cd425492bde..dd10a064792a 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
#define __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
-#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
#include <com/sun/star/ucb/XInteractionSupplyAuthentication.idl>
-#endif
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
index 69c99a0d7c7f..f54777798dbf 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XInteractionSupplyName_idl__
#define __com_sun_star_ucb_XInteractionSupplyName_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
index e7b0feec1a3f..38be079f50a1 100644
--- a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
#define __com_sun_star_ucb_XParameterizedContentProvider_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
index 626c7c50729c..ba1c572ef80d 100644
--- a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
#define __com_sun_star_ucb_XPersistentPropertySet_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XProgressHandler.idl b/offapi/com/sun/star/ucb/XProgressHandler.idl
index 21665a0b3b3a..3c1b00d86efb 100644
--- a/offapi/com/sun/star/ucb/XProgressHandler.idl
+++ b/offapi/com/sun/star/ucb/XProgressHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ucb_XProgressHandler_idl__
#define __com_sun_star_ucb_XProgressHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcher.idl b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
index 3ca6f6005a32..d0abed2fa83e 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcher.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
#define __com_sun_star_ucb_XPropertyMatcher_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
#include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
index 32627ce4d37b..025b878d8561 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XPropertyMatcherFactory_idl__
#define __com_sun_star_ucb_XPropertyMatcherFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
#include <com/sun/star/ucb/XPropertyMatcher.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
#include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
index 6851d46c02a5..a165cc5d077a 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
#define __com_sun_star_ucb_XPropertySetRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
#include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
index 891ae7def9ad..ce7f5f0a3936 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
#define __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
#include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRecycler.idl b/offapi/com/sun/star/ucb/XRecycler.idl
index e3e193b6c460..4279328e3c38 100644
--- a/offapi/com/sun/star/ucb/XRecycler.idl
+++ b/offapi/com/sun/star/ucb/XRecycler.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ucb_XRecycler_idl__
#define __com_sun_star_ucb_XRecycler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
#include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
index 54aee34f4e7d..8a484a819171 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
#define __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
index 035b26a84151..d7fe4e22ead7 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
#define __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module ucb {
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
index 2b01cf258955..2c361381e0bb 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
#define __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
#include <com/sun/star/ucb/RemoteContentProviderChangeEvent.idl>
-#endif
module com { module sun { module star { module ucb {
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
index ca43be38e95a..57f93a5e39f8 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
#define __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module ucb {
published interface XRemoteContentProviderChangeListener;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
index 1bb56c3d7616..ae969de0aca3 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
#define __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module ucb {
published interface XRemoteContentProviderAcceptor;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
index cee71bbce447..ffa4b961ab00 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
#define __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
-#ifndef __com_sun_star_connection_ConnectionSetupException_idl__
#include <com/sun/star/connection/ConnectionSetupException.idl>
-#endif
-
-#ifndef __com_sun_star_connection_NoConnectException_idl__
#include <com/sun/star/connection/NoConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
index 8786c28b49e5..f5f4a582cc6b 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
#define __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module ucb {
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
index 037d67af4d36..8d90633e1f6e 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
#define __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
index 122bde51ef1c..0f77fd63ae84 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
#define __com_sun_star_ucb_XSimpleFileAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
#include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
index 92bdb9ca6365..b43837cb1459 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
#define __com_sun_star_ucb_XSimpleFileAccess2_idl__
-#ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
#include <com/sun/star/ucb/XSimpleFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
index 396a0d3892c4..6262f734a5c5 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ucb_XSimpleFileAccess3_idl__
#define __com_sun_star_ucb_XSimpleFileAccess3_idl__
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
#include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
index c5caaa9709c7..161698a0e94d 100644
--- a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
@@ -27,19 +27,10 @@
#ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
#define __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
#include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
#include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
#include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSourceInitialization.idl b/offapi/com/sun/star/ucb/XSourceInitialization.idl
index b091faece81d..c518c358b23f 100644
--- a/offapi/com/sun/star/ucb/XSourceInitialization.idl
+++ b/offapi/com/sun/star/ucb/XSourceInitialization.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
#define __com_sun_star_ucb_XSourceInitialization_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
#include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index 98d72c25e8ad..6674dc174040 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
#define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/ActionTrigger.idl b/offapi/com/sun/star/ui/ActionTrigger.idl
index fd41e7ae38f2..73c6faa47f2a 100644
--- a/offapi/com/sun/star/ui/ActionTrigger.idl
+++ b/offapi/com/sun/star/ui/ActionTrigger.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_ui_ActionTrigger_idl__
#define __com_sun_star_ui_ActionTrigger_idl__
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ActionTriggerContainer.idl b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
index fd11ff28d102..3922bb0c40a2 100644
--- a/offapi/com/sun/star/ui/ActionTriggerContainer.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ui_ActionTriggerContainer_idl__
#define __com_sun_star_ui_ActionTriggerContainer_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index afde83a344bd..98e380c95546 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_ui_ConfigurableUIElement_idl__
#define __com_sun_star_ui_ConfigurableUIElement_idl__
-#ifndef __com_sun_star_ui_UIElement_idl__
#include <com/sun/star/ui/UIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementSettings_idl__
#include <com/sun/star/ui/XUIElementSettings.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ui_UIElementType_idl__
#include <com/sun/star/ui/UIElementType.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/ConfigurationEvent.idl b/offapi/com/sun/star/ui/ConfigurationEvent.idl
index b778bda9ac8a..14580c18a4ef 100644
--- a/offapi/com/sun/star/ui/ConfigurationEvent.idl
+++ b/offapi/com/sun/star/ui/ConfigurationEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_ConfigurationEvent_idl__
#define __com_sun_star_ui_ConfigurationEvent_idl__
-#ifndef __com_sun_star_container_ContainerEvent_idl__
#include <com/sun/star/container/ContainerEvent.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
index 09fa6843efb7..eadf26e8f738 100644
--- a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
+++ b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
#define __com_sun_star_ui_ContextMenuExecuteEvent_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
index f0552332946d..14db19801cdc 100644
--- a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
#define __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
-#ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
#include <com/sun/star/ui/XAcceleratorConfiguration.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index b6e9c2404330..df3f4c355a3b 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_ItemDescriptor_idl__
#define __com_sun_star_ui_ItemDescriptor_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 3253b1152221..39d209175706 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
#define __com_sun_star_ui_ModuleUICommandDescription_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
index 3b7aafc40059..f3c5b16bc616 100644
--- a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
#define __com_sun_star_ui_ModuleUICommandDescription_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index f2e46b18712c..18b6f85b50bc 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_ui_ModuleUIConfigurationManager_idl__
#define __com_sun_star_ui_ModuleUIConfigurationManager_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
#include <com/sun/star/ui/XModuleUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
#include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 0a405a1ac64b..a14cfd7a6524 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
#define __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index bede01c0aeb0..fa0dac13e4e1 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
#define __com_sun_star_ui_ModuleUICommandDescription_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl
index 5698ff74fccf..00e1833e78bc 100644
--- a/offapi/com/sun/star/ui/UICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/UICategoryDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ui_UICategoryDescription_idl__
#define __com_sun_star_ui_UICategoryDescription_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index bd1f35926149..8e22146d87a3 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_UICommandDescription_idl__
#define __com_sun_star_ui_UICommandDescription_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl
index d8b7b3305c38..017275f09cf3 100644
--- a/offapi/com/sun/star/ui/UIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_ui_UIConfigurationManager_idl__
#define __com_sun_star_ui_UIConfigurationManager_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
#include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
#include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 610cfa73ae25..9b530b9f0a44 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_ui_UIElement_idl__
#define __com_sun_star_ui_UIElement_idl__
-#ifndef __com_sun_star_ui_XUIElement_idl__
#include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
#include <com/sun/star/util/XUpdatable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index 1c07575e65fc..303d8e5d6b82 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_UIElementFactory_idl__
#define __com_sun_star_ui_UIElementFactory_idl__
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
#include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
index 8a150c1af2cc..cfc1cfdf5463 100644
--- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl
+++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_UIElementFactory_idl__
#define __com_sun_star_ui_UIElementFactory_idl__
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactoryRegistration_idl__
#include <com/sun/star/ui/XUIElementFactoryRegistration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/UIElementSettings.idl b/offapi/com/sun/star/ui/UIElementSettings.idl
index a5e4465a3a44..29cbb55eaa39 100644
--- a/offapi/com/sun/star/ui/UIElementSettings.idl
+++ b/offapi/com/sun/star/ui/UIElementSettings.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_UIElementSettings_idl__
#define __com_sun_star_ui_UIElementSettings_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
#include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/WindowContentFactory.idl b/offapi/com/sun/star/ui/WindowContentFactory.idl
index 991c92c812cf..135b3aae3cd6 100644
--- a/offapi/com/sun/star/ui/WindowContentFactory.idl
+++ b/offapi/com/sun/star/ui/WindowContentFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_WindowContentFactory_idl__
#define __com_sun_star_ui_WindowContentFactory_idl__
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
#include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index 531b1fe777f6..a4e94bb37d62 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_WindowStateConfiguration_idl__
#define __com_sun_star_ui_WindowStateConfiguration_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index fd7e94f99f8f..75740e02a1cd 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
#define __com_sun_star_ui_XAcceleratorConfiguration_idl__
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
#include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
#include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XContextMenuInterception.idl b/offapi/com/sun/star/ui/XContextMenuInterception.idl
index 5d7df3baa00d..0958d2c871a5 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterception.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterception.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
#define __com_sun_star_ui_XContextMenuInterception_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
index 604cda99c839..9d03bdb256ac 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
@@ -27,16 +27,9 @@
#ifndef __com_sun_star_ui_XContextMenuInterceptor_idl__
#define __com_sun_star_ui_XContextMenuInterceptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ContextMenuInterceptorAction_idl__
#include <com/sun/star/ui/ContextMenuInterceptorAction.idl>
-#endif
-#ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
#include <com/sun/star/ui/ContextMenuExecuteEvent.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index f3912a12c1a6..98c2a8c79a0c 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
#define __com_sun_star_ui_XDockingAreaAcceptor_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
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index e367d1184efb..beb522241d4e 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -28,41 +28,15 @@
#ifndef __com_sun_star_ui_XImageManager_idl__
#define __com_sun_star_ui_XImageManager_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_graphic_XGraphic_idl__
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
#include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ImageType_idl__
#include <com/sun/star/ui/ImageType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
index b95d686ff776..cefadb7aee26 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
#define __com_sun_star_ui_XModuleUIConfigurationManager_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index f1eb20a785e0..08f358fb1dc5 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
#define __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 95ec91a65f5b..0411e14aaaaf 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_XUIConfiguration_idl__
#define __com_sun_star_ui_XUIConfiguration_idl__
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index 2e89eee6bea0..02b4969d314e 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#define __com_sun_star_ui_XUIConfigurationListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ConfigurationEvent_idl__
#include <com/sun/star/ui/ConfigurationEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index f62e1ce87a21..c7bab256552b 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -28,41 +28,15 @@
#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#define __com_sun_star_ui_XUIConfigurationManager_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index a1f091623a30..27d86382b720 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
#define __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index aae269b58c26..dc475d209025 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
#define __com_sun_star_ui_XUIConfigurationPersistence_idl__
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
module com { module sun { module star { module ui {
diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index 47aee612d0f5..61f9c436de0f 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
#define __com_sun_star_ui_XUIConfigurationStorage_idl__
-#ifndef __com_sun_star_embed_XStorage_idl__
#include <com/sun/star/embed/XStorage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 26536a85f29f..57f0d4a71156 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ui_XUIElement_idl__
#define __com_sun_star_ui_XUIElement_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 05fe8746d387..4b2a180add93 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_ui_XUIElementFactory_idl__
#define __com_sun_star_ui_XUIElementFactory_idl__
-#ifndef __com_sun_star_ui_XUIElement_idl__
#include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index b0e08d0ee677..f5dc9d758748 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_frame_XUIElementFactoryRegistration_idl__
#define __com_sun_star_frame_XUIElementFactoryRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
#include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 87681ec508cd..6659cd357dcd 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_XUIElementSettings_idl__
#define __com_sun_star_ui_XUIElementSettings_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index e62670bec558..7add74469990 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XUIFunctionListener_idl__
#define __com_sun_star_frame_XUIFunctionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
index 107ec70ca2cc..f3c5a86f8c84 100644
--- a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
#define __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
index c509e50b7576..300b5859e40d 100644
--- a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
#define __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
index c208bb75d91d..8719623f8350 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_ui_dialogs_FilePicker_idl__
#define __com_sun_star_ui_dialogs_FilePicker_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
index d57f08a921b6..1f8188984e5e 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
#define __com_sun_star_ui_dialogs_FilePickerEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index fc0f6c480b84..95b6d90cdad1 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
#define __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
index 2faaf20e5b29..e5452aab6850 100644
--- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_ui_dialogs_FolderPicker_idl__
#define __com_sun_star_ui_dialogs_FolderPicker_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
index 4e00b56a494d..90a66b79042c 100644
--- a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
#define __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
#include <com/sun/star/ui/dialogs/XDialogClosedListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
index 9e4c22a5f578..65613622d55f 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XControlAccess_idl__
#define __com_sun_star_ui_dialogs_XControlAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
index fe920945b90e..e1726c7744e3 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XControlInformation_idl__
#define __com_sun_star_ui_dialogs_XControlInformation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
index 0f03d37efea2..d3770bf0ebc8 100644
--- a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
#define __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
#include <com/sun/star/ui/dialogs/DialogClosedEvent.idl>
-#endif
module com { module sun { module star { module ui { module dialogs {
diff --git a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
index 7cedeb3c136a..fc9eaf152e0f 100644
--- a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#define __com_sun_star_ui_dialogs_XExecutableDialog_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
index 6a564d178a47..21841212e2db 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
#define __com_sun_star_ui_dialogs_XFilePicker_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
index 925451c6b24c..908ea3798557 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_dialogs_XFilePicker2_idl__
#define __com_sun_star_ui_dialogs_XFilePicker2_idl__
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
#include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
index a4a191dfc772..bf8d4d91ebbb 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
#define __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
#include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
index 33ec9f5e1c36..7994b2b4eb3b 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
#define __com_sun_star_ui_dialogs_XFilePickerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
#include <com/sun/star/ui/dialogs/FilePickerEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
index 862e92b7084d..e9c7d26ee6e4 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
#define __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
#include <com/sun/star/ui/dialogs/XFilePickerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index cbe7c49cd16b..184d77c603e1 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_ui_dialogs_XFilePreview_idl__
#define __com_sun_star_ui_dialogs_XFilePreview_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_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
index 67484d301299..df327953b1d9 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_ui_dialogs_XFilterManager_idl__
#define __com_sun_star_ui_dialogs_XFilterManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
index 4f0c0f981dd1..13e94dbb008a 100644
--- a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_ui_dialogs_XFolderPicker_idl__
#define __com_sun_star_ui_dialogs_XFolderPicker_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ChangesEvent.idl b/offapi/com/sun/star/util/ChangesEvent.idl
index e17893d52115..92a0a537bda3 100644
--- a/offapi/com/sun/star/util/ChangesEvent.idl
+++ b/offapi/com/sun/star/util/ChangesEvent.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_ChangesEvent_idl__
#define __com_sun_star_util_ChangesEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesSet_idl__
#include <com/sun/star/util/ChangesSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ChangesSet.idl b/offapi/com/sun/star/util/ChangesSet.idl
index 439ff2e31861..41b8f2d29b03 100644
--- a/offapi/com/sun/star/util/ChangesSet.idl
+++ b/offapi/com/sun/star/util/ChangesSet.idl
@@ -27,14 +27,10 @@
#ifndef __com_sun_star_util_ChangesSet_idl__
#define __com_sun_star_util_ChangesSet_idl__
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
/*
-#ifndef __com_sun_star_util_XChangesSet_idl__
#include <com/sun/star/util/XChangesSet.idl>
-#endif
*/
//=============================================================================
diff --git a/offapi/com/sun/star/util/CloseVetoException.idl b/offapi/com/sun/star/util/CloseVetoException.idl
index 49608f76b0be..bff5ad8e3166 100644
--- a/offapi/com/sun/star/util/CloseVetoException.idl
+++ b/offapi/com/sun/star/util/CloseVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_CloseVetoException_idl__
#define __com_sun_star_util_CloseVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/DataEditorEvent.idl b/offapi/com/sun/star/util/DataEditorEvent.idl
index 0d5b34cc00ae..351755dcbc9a 100644
--- a/offapi/com/sun/star/util/DataEditorEvent.idl
+++ b/offapi/com/sun/star/util/DataEditorEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_DataEditorEvent_idl__
#define __com_sun_star_util_DataEditorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_util_DataEditorEventType_idl__
#include <com/sun/star/util/DataEditorEventType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/DiskFullException.idl b/offapi/com/sun/star/util/DiskFullException.idl
index 43eda08302a2..2387feb87d3d 100644
--- a/offapi/com/sun/star/util/DiskFullException.idl
+++ b/offapi/com/sun/star/util/DiskFullException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_DiskFullException_idl__
#define __com_sun_star_util_DiskFullException_idl__
-#ifndef __com_sun_star_util_FileIOException_idl__
#include <com/sun/star/util/FileIOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/FileIOException.idl b/offapi/com/sun/star/util/FileIOException.idl
index 804c18094704..61a07bff7c35 100644
--- a/offapi/com/sun/star/util/FileIOException.idl
+++ b/offapi/com/sun/star/util/FileIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_FileIOException_idl__
#define __com_sun_star_util_FileIOException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index e90c4ed572b2..71baadb755ed 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun__star_util_JobManager_idl__
#define __com_sun__star_util_JobManager_idl__
-#ifndef __com_sun_star_util_XJobManager_idl__
#include <com/sun/star/util/XJobManager.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/MalformedNumberFormatException.idl b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
index f084663289d3..72ee5f489c6a 100644
--- a/offapi/com/sun/star/util/MalformedNumberFormatException.idl
+++ b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#define __com_sun_star_util_MalformedNumberFormatException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ModeChangeEvent.idl b/offapi/com/sun/star/util/ModeChangeEvent.idl
index f03b337e1bbc..b6a84c3cc2e1 100644
--- a/offapi/com/sun/star/util/ModeChangeEvent.idl
+++ b/offapi/com/sun/star/util/ModeChangeEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#define __com_sun_star_util_ModeChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NotNumericException.idl b/offapi/com/sun/star/util/NotNumericException.idl
index ed1d550c2163..e511fd4df745 100644
--- a/offapi/com/sun/star/util/NotNumericException.idl
+++ b/offapi/com/sun/star/util/NotNumericException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_NotNumericException_idl__
#define __com_sun_star_util_NotNumericException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatProperties.idl b/offapi/com/sun/star/util/NumberFormatProperties.idl
index 7c747aff3d0f..f385a9019137 100644
--- a/offapi/com/sun/star/util/NumberFormatProperties.idl
+++ b/offapi/com/sun/star/util/NumberFormatProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_NumberFormatProperties_idl__
#define __com_sun_star_util_NumberFormatProperties_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatSettings.idl b/offapi/com/sun/star/util/NumberFormatSettings.idl
index 2f1013ae93ad..6b327c94b075 100644
--- a/offapi/com/sun/star/util/NumberFormatSettings.idl
+++ b/offapi/com/sun/star/util/NumberFormatSettings.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormatSettings_idl__
#define __com_sun_star_util_NumberFormatSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormats.idl b/offapi/com/sun/star/util/NumberFormats.idl
index a451fd1b7a4f..11eadaf86910 100644
--- a/offapi/com/sun/star/util/NumberFormats.idl
+++ b/offapi/com/sun/star/util/NumberFormats.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormats_idl__
#define __com_sun_star_util_NumberFormats_idl__
-#ifndef __com_sun_star_util_XNumberFormats_idl__
#include <com/sun/star/util/XNumberFormats.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
#include <com/sun/star/util/XNumberFormatTypes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 3b7fae2d7ecb..e7bde9de4636 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_NumberFormatsSupplier_idl__
#define __com_sun_star_util_NumberFormatsSupplier_idl__
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index c130dfebc210..daa4ff5e1e25 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormatter_idl__
#define __com_sun_star_util_NumberFormatter_idl__
-#ifndef __com_sun_star_util_XNumberFormatter_idl__
#include <com/sun/star/util/XNumberFormatter.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
#include <com/sun/star/util/XNumberFormatPreviewer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index 302330fb2eec..c6bee6191e05 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_OfficeInstallationDirectories_idl__
#define __com_sun_star_util_OfficeInstallationDirectories_idl__
-#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
#include <com/sun/star/util/XOfficeInstallationDirectories.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index 3c6d92c584c6..2496e3071b30 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_PathSettings_idl__
#define __com_sun_star_util_PathSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index dcc3bdab976d..46711e3c97f5 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_PathSubstitution_idl__
#define __com_sun_star_util_PathSubstitution_idl__
-#ifndef __com_sun_star_util_XStringSubstitution_idl__
#include <com/sun/star/util/XStringSubstitution.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerListener_idl__
#include <com/sun/star/container/XContainerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ReplaceDescriptor.idl b/offapi/com/sun/star/util/ReplaceDescriptor.idl
index 192c10707226..eea45c5c6941 100644
--- a/offapi/com/sun/star/util/ReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/ReplaceDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_ReplaceDescriptor_idl__
#define __com_sun_star_util_ReplaceDescriptor_idl__
-#ifndef __com_sun_star_util_SearchDescriptor_idl__
#include <com/sun/star/util/SearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SearchDescriptor.idl b/offapi/com/sun/star/util/SearchDescriptor.idl
index b49e174ccf50..cd334f763b06 100644
--- a/offapi/com/sun/star/util/SearchDescriptor.idl
+++ b/offapi/com/sun/star/util/SearchDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_SearchDescriptor_idl__
#define __com_sun_star_util_SearchDescriptor_idl__
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index 2c0b1d2ac83f..e42ef03f96df 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_SortDescriptor_idl__
#define __com_sun_star_util_SortDescriptor_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SortField.idl b/offapi/com/sun/star/util/SortField.idl
index 0c20871f3863..f1edab68800b 100644
--- a/offapi/com/sun/star/util/SortField.idl
+++ b/offapi/com/sun/star/util/SortField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_SortField_idl__
#define __com_sun_star_util_SortField_idl__
-#ifndef __com_sun_star_util_SortFieldType_idl__
#include <com/sun/star/util/SortFieldType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/Sortable.idl b/offapi/com/sun/star/util/Sortable.idl
index 8b0f7e0688e2..cced73bcbcba 100644
--- a/offapi/com/sun/star/util/Sortable.idl
+++ b/offapi/com/sun/star/util/Sortable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_Sortable_idl__
#define __com_sun_star_util_Sortable_idl__
-#ifndef __com_sun_star_util_SortDescriptor_idl__
#include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index f6abf8c088e1..3154389afae6 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_TextSearch_idl__
#define __com_sun_star_util_TextSearch_idl__
-#ifndef __com_sun_star_lang_XTextSearch_idl__
#include <com/sun/star/util/XTextSearch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 46b4879a7e7d..8839ad229154 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_URLTransformer_idl__
#define __com_sun_star_util_URLTransformer_idl__
-#ifndef __com_sun_star_util_XURLTransformer_idl__
#include <com/sun/star/util/XURLTransformer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 2825fe74b32d..14a88deed4b9 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun__star_util_UriAbbreviation_idl__
#define __com_sun__star_util_UriAbbreviation_idl__
-#ifndef __com_sun_star_util_XStringAbbreviation_idl__
#include <com/sun/star/util/XStringAbbreviation.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/VetoException.idl b/offapi/com/sun/star/util/VetoException.idl
index fdf4d084d790..d197c3c9b350 100644
--- a/offapi/com/sun/star/util/VetoException.idl
+++ b/offapi/com/sun/star/util/VetoException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_VetoException_idl__
#define __com_sun_star_util_VetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XArchiver.idl b/offapi/com/sun/star/util/XArchiver.idl
index d3aee96cf08c..6a4e43f7f674 100644
--- a/offapi/com/sun/star/util/XArchiver.idl
+++ b/offapi/com/sun/star/util/XArchiver.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XArchiver_idl__
#define __com_sun_star_util_XArchiver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XAtomServer.idl b/offapi/com/sun/star/util/XAtomServer.idl
index 0472ea2b7946..3150454489f5 100644
--- a/offapi/com/sun/star/util/XAtomServer.idl
+++ b/offapi/com/sun/star/util/XAtomServer.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_util_XAtomServer_idl__
#define __com_sun_star_util_XAtomServer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomDescription_idl__
#include <com/sun/star/util/AtomDescription.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomClassRequest_idl__
#include <com/sun/star/util/AtomClassRequest.idl>
-#endif
module com
diff --git a/offapi/com/sun/star/util/XBroadcaster.idl b/offapi/com/sun/star/util/XBroadcaster.idl
index 05b2a2922609..81e9494767ce 100644
--- a/offapi/com/sun/star/util/XBroadcaster.idl
+++ b/offapi/com/sun/star/util/XBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XBroadcaster_idl__
#define __com_sun_star_util_XBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCancelManager.idl b/offapi/com/sun/star/util/XCancelManager.idl
index 91ea42356bea..ef9ae90b5f54 100644
--- a/offapi/com/sun/star/util/XCancelManager.idl
+++ b/offapi/com/sun/star/util/XCancelManager.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XCancelManager_idl__
#define __com_sun_star_util_XCancelManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCancellable.idl b/offapi/com/sun/star/util/XCancellable.idl
index 5e8fa59b05f6..f7915c133672 100644
--- a/offapi/com/sun/star/util/XCancellable.idl
+++ b/offapi/com/sun/star/util/XCancellable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XCancellable_idl__
#define __com_sun_star_util_XCancellable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChainable.idl b/offapi/com/sun/star/util/XChainable.idl
index e381bc683839..41d7d1f9843c 100644
--- a/offapi/com/sun/star/util/XChainable.idl
+++ b/offapi/com/sun/star/util/XChainable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XChainable_idl__
#define __com_sun_star_util_XChainable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesBatch.idl b/offapi/com/sun/star/util/XChangesBatch.idl
index 2c8abbede55a..a42e7bc69050 100644
--- a/offapi/com/sun/star/util/XChangesBatch.idl
+++ b/offapi/com/sun/star/util/XChangesBatch.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XChangesBatch_idl__
#define __com_sun_star_util_XChangesBatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesSet_idl__
#include <com/sun/star/util/ChangesSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesListener.idl b/offapi/com/sun/star/util/XChangesListener.idl
index 5591c2caf091..3ef055dfeef2 100644
--- a/offapi/com/sun/star/util/XChangesListener.idl
+++ b/offapi/com/sun/star/util/XChangesListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XChangesListener_idl__
#define __com_sun_star_util_XChangesListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesEvent_idl__
#include <com/sun/star/util/ChangesEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl
index f532bc6b476f..fc6081a93791 100644
--- a/offapi/com/sun/star/util/XChangesNotifier.idl
+++ b/offapi/com/sun/star/util/XChangesNotifier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XChangesNotifier_idl__
#define __com_sun_star_util_XChangesNotifier_idl__
-#ifndef __com_sun_star_util_XChangesListener_idl__
#include <com/sun/star/util/XChangesListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesSet.idl b/offapi/com/sun/star/util/XChangesSet.idl
index b812d0389eef..3db6539260fc 100644
--- a/offapi/com/sun/star/util/XChangesSet.idl
+++ b/offapi/com/sun/star/util/XChangesSet.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XChangesSet_idl__
#define __com_sun_star_util_XChangesSet_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloneable.idl b/offapi/com/sun/star/util/XCloneable.idl
index f89fcb9eb96d..a47ba1371e4f 100644
--- a/offapi/com/sun/star/util/XCloneable.idl
+++ b/offapi/com/sun/star/util/XCloneable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XCloneable_idl__
#define __com_sun_star_util_XCloneable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloseBroadcaster.idl b/offapi/com/sun/star/util/XCloseBroadcaster.idl
index 84541f4fc7fc..07719e231b7c 100644
--- a/offapi/com/sun/star/util/XCloseBroadcaster.idl
+++ b/offapi/com/sun/star/util/XCloseBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
#define __com_sun_star_util_XCloseBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseListener_idl__
#include <com/sun/star/util/XCloseListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl
index ecbf526c75c4..0e9037a3812d 100644
--- a/offapi/com/sun/star/util/XCloseListener.idl
+++ b/offapi/com/sun/star/util/XCloseListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_util_XCloseListener_idl__
#define __com_sun_star_util_XCloseListener_idl__
-#ifndef __com_sun_star_util_CloseVetoException_idl__
#include <com/sun/star/util/CloseVetoException.idl>
-#endif
-
-#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/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 28b37907bbe4..28c0371325ee 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XClosable_idl__
#define __com_sun_star_util_XClosable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
#include <com/sun/star/util/XCloseBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XDataEditor.idl b/offapi/com/sun/star/util/XDataEditor.idl
index 82cc18d53eae..874a7ca55b8f 100644
--- a/offapi/com/sun/star/util/XDataEditor.idl
+++ b/offapi/com/sun/star/util/XDataEditor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XDataEditor_idl__
#define __com_sun_star_util_XDataEditor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XDataEditorListener_idl__
#include <com/sun/star/util/XDataEditorListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XDataEditorListener.idl b/offapi/com/sun/star/util/XDataEditorListener.idl
index abe91ed2a36a..7864b3f8b6d4 100644
--- a/offapi/com/sun/star/util/XDataEditorListener.idl
+++ b/offapi/com/sun/star/util/XDataEditorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XDataEditorListener_idl__
#define __com_sun_star_util_XDataEditorListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_DataEditorEvent_idl__
#include <com/sun/star/util/DataEditorEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XFlushListener.idl b/offapi/com/sun/star/util/XFlushListener.idl
index 521aebc5e003..7a155f59e606 100644
--- a/offapi/com/sun/star/util/XFlushListener.idl
+++ b/offapi/com/sun/star/util/XFlushListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XFlushListener_idl__
#define __com_sun_star_util_XFlushListener_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/util/XFlushable.idl b/offapi/com/sun/star/util/XFlushable.idl
index 668d64055ed8..e468f4351ec4 100644
--- a/offapi/com/sun/star/util/XFlushable.idl
+++ b/offapi/com/sun/star/util/XFlushable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XFlushable_idl__
#define __com_sun_star_util_XFlushable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushListener_idl__
#include <com/sun/star/util/XFlushListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 05872c6e3231..31b8a38f1802 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XImportable_idl__
#define __com_sun_star_util_XImportable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XIndent.idl b/offapi/com/sun/star/util/XIndent.idl
index dffd7334316b..887bd4af1683 100644
--- a/offapi/com/sun/star/util/XIndent.idl
+++ b/offapi/com/sun/star/util/XIndent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XIndent_idl__
#define __com_sun_star_util_XIndent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XJobManager.idl b/offapi/com/sun/star/util/XJobManager.idl
index 7c75a83d036d..56eb08f51a04 100644
--- a/offapi/com/sun/star/util/XJobManager.idl
+++ b/offapi/com/sun/star/util/XJobManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_XJobManager_idl__
#define __com_sun_star_util_XJobManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XLinkUpdate.idl b/offapi/com/sun/star/util/XLinkUpdate.idl
index d4c3a1a41850..6b2da86142e9 100644
--- a/offapi/com/sun/star/util/XLinkUpdate.idl
+++ b/offapi/com/sun/star/util/XLinkUpdate.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XLinkUpdate_idl__
#define __com_sun_star_util_XLinkUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XLocalizedAliases.idl b/offapi/com/sun/star/util/XLocalizedAliases.idl
index 3e9ba00f1195..0dd7bce38ead 100644
--- a/offapi/com/sun/star/util/XLocalizedAliases.idl
+++ b/offapi/com/sun/star/util/XLocalizedAliases.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XLocalizedAliases_idl__
#define __com_sun_star_util_XLocalizedAliases_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__
#include <com/sun/star/util/AliasProgrammaticPair.idl>
-#endif
//=============================================================================
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XMergeable.idl b/offapi/com/sun/star/util/XMergeable.idl
index ba2ac3bc90ea..1c3d82169e46 100644
--- a/offapi/com/sun/star/util/XMergeable.idl
+++ b/offapi/com/sun/star/util/XMergeable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XMergeable_idl__
#define __com_sun_star_util_XMergeable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index 76226462531f..f973f503ec4f 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
#define __com_sun_star_util_XModeChangeApproveListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index 1c9cbbde8fa8..3c297dfa4646 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_util_XModeChangeBroadcaster_idl__
#define __com_sun_star_util_XModeChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeListener_idl__
#include <com/sun/star/util/XModeChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
#include <com/sun/star/util/XModeChangeApproveListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index 5f3437081585..417f029eee43 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -28,13 +28,9 @@
#ifndef __com_sun_star_util_XModeChangeListener_idl__
#define __com_sun_star_util_XModeChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeSelector.idl b/offapi/com/sun/star/util/XModeSelector.idl
index 7efefb361a04..24a740d79090 100644
--- a/offapi/com/sun/star/util/XModeSelector.idl
+++ b/offapi/com/sun/star/util/XModeSelector.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModeSelector_idl__
#define __com_sun_star_util_XModeSelector_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable.idl b/offapi/com/sun/star/util/XModifiable.idl
index 2f0b37531aca..972b99c9e4ab 100644
--- a/offapi/com/sun/star/util/XModifiable.idl
+++ b/offapi/com/sun/star/util/XModifiable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifiable_idl__
#define __com_sun_star_util_XModifiable_idl__
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index a2f7287a4a83..3352562d986a 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifiable2_idl__
#define __com_sun_star_util_XModifiable2_idl__
-#ifndef __com_sun_star_util_XModifiable_idl__
#include <com/sun/star/util/XModifiable.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifyBroadcaster.idl b/offapi/com/sun/star/util/XModifyBroadcaster.idl
index 657db5400126..d65f3661342f 100644
--- a/offapi/com/sun/star/util/XModifyBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModifyBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#define __com_sun_star_util_XModifyBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyListener_idl__
#include <com/sun/star/util/XModifyListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifyListener.idl b/offapi/com/sun/star/util/XModifyListener.idl
index e31574aaff2a..b9eefa7a1664 100644
--- a/offapi/com/sun/star/util/XModifyListener.idl
+++ b/offapi/com/sun/star/util/XModifyListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifyListener_idl__
#define __com_sun_star_util_XModifyListener_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/util/XNumberFormatPreviewer.idl b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
index cd94ebd1335f..f53a62363ea5 100644
--- a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
+++ b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
#define __com_sun_star_util_XNumberFormatPreviewer_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_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatTypes.idl b/offapi/com/sun/star/util/XNumberFormatTypes.idl
index 9c896440e20e..399bb715f35c 100644
--- a/offapi/com/sun/star/util/XNumberFormatTypes.idl
+++ b/offapi/com/sun/star/util/XNumberFormatTypes.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
#define __com_sun_star_util_XNumberFormatTypes_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl b/offapi/com/sun/star/util/XNumberFormats.idl
index 25954d8e4f99..527681dde3a8 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XNumberFormats_idl__
#define __com_sun_star_util_XNumberFormats_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
index 505be56288bc..4bb5085fa34d 100644
--- a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#define __com_sun_star_util_XNumberFormatsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormats_idl__
#include <com/sun/star/util/XNumberFormats.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatter.idl b/offapi/com/sun/star/util/XNumberFormatter.idl
index f01f1b30bf73..b0e44ab2d731 100644
--- a/offapi/com/sun/star/util/XNumberFormatter.idl
+++ b/offapi/com/sun/star/util/XNumberFormatter.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_util_XNumberFormatter_idl__
#define __com_sun_star_util_XNumberFormatter_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_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-#ifndef __com_sun_star_util_NotNumericException_idl__
#include <com/sun/star/util/NotNumericException.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index 93d994eb6e0f..ea729b478d5e 100644
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
#define __com_sun_star_util_XOfficeInstallationDirectories_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XPropertyReplace.idl b/offapi/com/sun/star/util/XPropertyReplace.idl
index 7be1114220f3..29308d8e2c17 100644
--- a/offapi/com/sun/star/util/XPropertyReplace.idl
+++ b/offapi/com/sun/star/util/XPropertyReplace.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XPropertyReplace_idl__
#define __com_sun_star_util_XPropertyReplace_idl__
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XProtectable.idl b/offapi/com/sun/star/util/XProtectable.idl
index 57685a168bf5..cb81204ea2d7 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XProtectable_idl__
#define __com_sun_star_util_XProtectable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XRefreshListener.idl b/offapi/com/sun/star/util/XRefreshListener.idl
index 8286583015e1..2d2548dd9f19 100644
--- a/offapi/com/sun/star/util/XRefreshListener.idl
+++ b/offapi/com/sun/star/util/XRefreshListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XRefreshListener_idl__
#define __com_sun_star_util_XRefreshListener_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/util/XRefreshable.idl b/offapi/com/sun/star/util/XRefreshable.idl
index 1ed7e497a433..a99ae6f8fcc6 100644
--- a/offapi/com/sun/star/util/XRefreshable.idl
+++ b/offapi/com/sun/star/util/XRefreshable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XRefreshable_idl__
#define __com_sun_star_util_XRefreshable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XRefreshListener_idl__
#include <com/sun/star/util/XRefreshListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceDescriptor.idl b/offapi/com/sun/star/util/XReplaceDescriptor.idl
index e3bb662a2a0a..68d1a75293a1 100644
--- a/offapi/com/sun/star/util/XReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/XReplaceDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#define __com_sun_star_util_XReplaceDescriptor_idl__
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceable.idl b/offapi/com/sun/star/util/XReplaceable.idl
index 847a7bf9e1b0..994fde57690a 100644
--- a/offapi/com/sun/star/util/XReplaceable.idl
+++ b/offapi/com/sun/star/util/XReplaceable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XReplaceable_idl__
#define __com_sun_star_util_XReplaceable_idl__
-#ifndef __com_sun_star_util_XSearchable_idl__
#include <com/sun/star/util/XSearchable.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSearchDescriptor.idl b/offapi/com/sun/star/util/XSearchDescriptor.idl
index dde3589773dd..07979aefb038 100644
--- a/offapi/com/sun/star/util/XSearchDescriptor.idl
+++ b/offapi/com/sun/star/util/XSearchDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#define __com_sun_star_util_XSearchDescriptor_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSearchable.idl b/offapi/com/sun/star/util/XSearchable.idl
index fce6b411ce9c..87c8dc511a11 100644
--- a/offapi/com/sun/star/util/XSearchable.idl
+++ b/offapi/com/sun/star/util/XSearchable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XSearchable_idl__
#define __com_sun_star_util_XSearchable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSimpleErrorHandler.idl b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
index 1d3953d6ce14..e994aabf6836 100644
--- a/offapi/com/sun/star/util/XSimpleErrorHandler.idl
+++ b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XSimpleErrorHandler_idl__
#define __com_sun_star_util_XSimpleErrorHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSortable.idl b/offapi/com/sun/star/util/XSortable.idl
index 3e34db69d57f..3acfe51fd91f 100644
--- a/offapi/com/sun/star/util/XSortable.idl
+++ b/offapi/com/sun/star/util/XSortable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XSortable_idl__
#define __com_sun_star_util_XSortable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringAbbreviation.idl b/offapi/com/sun/star/util/XStringAbbreviation.idl
index 076b84b033c5..a5ba1d04dac5 100644
--- a/offapi/com/sun/star/util/XStringAbbreviation.idl
+++ b/offapi/com/sun/star/util/XStringAbbreviation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XStringAbbreviation_idl__
#define __com_sun_star_util_XStringAbbreviation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
published interface XStringWidth;
diff --git a/offapi/com/sun/star/util/XStringEscape.idl b/offapi/com/sun/star/util/XStringEscape.idl
index f73bf84c59ae..79742a47c63b 100644
--- a/offapi/com/sun/star/util/XStringEscape.idl
+++ b/offapi/com/sun/star/util/XStringEscape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XStringEscape_idl__
#define __com_sun_star_util_XStringEscape_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringMapping.idl b/offapi/com/sun/star/util/XStringMapping.idl
index b6afc14642e7..901ff3ac73e0 100644
--- a/offapi/com/sun/star/util/XStringMapping.idl
+++ b/offapi/com/sun/star/util/XStringMapping.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XStringMapping_idl__
#define __com_sun_star_util_XStringMapping_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringSubstitution.idl b/offapi/com/sun/star/util/XStringSubstitution.idl
index 18a84233af59..5b3c2dd6b99f 100644
--- a/offapi/com/sun/star/util/XStringSubstitution.idl
+++ b/offapi/com/sun/star/util/XStringSubstitution.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_XStringSubstitution_idl__
#define __com_sun_star_util_XStringSubstitution_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringWidth.idl b/offapi/com/sun/star/util/XStringWidth.idl
index 81d76dd79475..4b2414f1ed71 100644
--- a/offapi/com/sun/star/util/XStringWidth.idl
+++ b/offapi/com/sun/star/util/XStringWidth.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XStringWidth_idl__
#define __com_sun_star_util_XStringWidth_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XTimeStamped.idl b/offapi/com/sun/star/util/XTimeStamped.idl
index 39b2f3f5085b..6cabc0e345d9 100644
--- a/offapi/com/sun/star/util/XTimeStamped.idl
+++ b/offapi/com/sun/star/util/XTimeStamped.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XTimeStamped_idl__
#define __com_sun_star_util_XTimeStamped_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XURLTransformer.idl b/offapi/com/sun/star/util/XURLTransformer.idl
index 947f38596827..d762f3682d59 100644
--- a/offapi/com/sun/star/util/XURLTransformer.idl
+++ b/offapi/com/sun/star/util/XURLTransformer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XURLTransformer_idl__
#define __com_sun_star_util_XURLTransformer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index e79c36ab9c09..4cccd126b69d 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_XUniqueIDFactory_idl__
#define __com_sun_star_container_XUniqueIDFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XUpdatable.idl b/offapi/com/sun/star/util/XUpdatable.idl
index ed221a36ecdd..b6c3cee4c8f5 100644
--- a/offapi/com/sun/star/util/XUpdatable.idl
+++ b/offapi/com/sun/star/util/XUpdatable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XUpdatable_idl__
#define __com_sun_star_util_XUpdatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshListener_idl__
#include <com/sun/star/util/XRefreshListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/OfficeDocumentView.idl b/offapi/com/sun/star/view/OfficeDocumentView.idl
index 1ff13bc13f54..2c32d51b210a 100644
--- a/offapi/com/sun/star/view/OfficeDocumentView.idl
+++ b/offapi/com/sun/star/view/OfficeDocumentView.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_view_OfficeDocumentView_idl__
#define __com_sun_star_view_OfficeDocumentView_idl__
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
#include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_XControlAccess_idl__
#include <com/sun/star/view/XControlAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/PrintJobEvent.idl b/offapi/com/sun/star/view/PrintJobEvent.idl
index f1f81f3affa3..38f67486e79a 100644
--- a/offapi/com/sun/star/view/PrintJobEvent.idl
+++ b/offapi/com/sun/star/view/PrintJobEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_view_PrintJobEvent_idl__
#define __com_sun_star_view_PrintJobEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
#include <com/sun/star/view/PrintableState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/PrintableStateEvent.idl b/offapi/com/sun/star/view/PrintableStateEvent.idl
index a0a92cc02c6c..ddffa31ba916 100644
--- a/offapi/com/sun/star/view/PrintableStateEvent.idl
+++ b/offapi/com/sun/star/view/PrintableStateEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_view_PrintableStateEvent_idl__
#define __com_sun_star_view_PrintableStateEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
#include <com/sun/star/view/PrintableState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index 006e1969fedb..b6c608a184fd 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_view_PrinterDescriptor_idl__
#define __com_sun_star_view_PrinterDescriptor_idl__
-#ifndef __com_sun_star_view_PaperOrientation_idl__
#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-#ifndef __com_sun_star_view_PaperFormat_idl__
#include <com/sun/star/view/PaperFormat.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/RenderDescriptor.idl b/offapi/com/sun/star/view/RenderDescriptor.idl
index 7aa5e058471c..25cb15c0b15c 100644
--- a/offapi/com/sun/star/view/RenderDescriptor.idl
+++ b/offapi/com/sun/star/view/RenderDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_RenderDescriptor_idl__
#define __com_sun_star_view_RenderDescriptor_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/RenderOptions.idl b/offapi/com/sun/star/view/RenderOptions.idl
index 584a23236136..a4291f1634d3 100644
--- a/offapi/com/sun/star/view/RenderOptions.idl
+++ b/offapi/com/sun/star/view/RenderOptions.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_RenderOptions_idl__
#define __com_sun_star_view_RenderOptions_idl__
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/ViewSettings.idl b/offapi/com/sun/star/view/ViewSettings.idl
index 3ef70fdfb202..fd2efbf30865 100644
--- a/offapi/com/sun/star/view/ViewSettings.idl
+++ b/offapi/com/sun/star/view/ViewSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_ViewSettings_idl__
#define __com_sun_star_view_ViewSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XControlAccess.idl b/offapi/com/sun/star/view/XControlAccess.idl
index 1a7264320fd8..157ce7fb1e88 100644
--- a/offapi/com/sun/star/view/XControlAccess.idl
+++ b/offapi/com/sun/star/view/XControlAccess.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_view_XControlAccess_idl__
#define __com_sun_star_view_XControlAccess_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
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XFormLayerAccess.idl b/offapi/com/sun/star/view/XFormLayerAccess.idl
index 165f79dd0c44..801290940c54 100644
--- a/offapi/com/sun/star/view/XFormLayerAccess.idl
+++ b/offapi/com/sun/star/view/XFormLayerAccess.idl
@@ -28,18 +28,10 @@
#ifndef __offapi_com_sun_star_view_XFormLayerAccess_idl__
#define __offapi_com_sun_star_view_XFormLayerAccess_idl__
-#ifndef __com_sun_star_view_XControlAccess_idl__
#include <com/sun/star/view/XControlAccess.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XLineCursor.idl b/offapi/com/sun/star/view/XLineCursor.idl
index 320831f308ba..e0f801fe58bd 100644
--- a/offapi/com/sun/star/view/XLineCursor.idl
+++ b/offapi/com/sun/star/view/XLineCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_XLineCursor_idl__
#define __com_sun_star_view_XLineCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index 3557b3c47fae..1bea781dd3a4 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
#define __com_sun_star_view_XMultiSelectionSupplier_idl__
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintJob.idl b/offapi/com/sun/star/view/XPrintJob.idl
index 5898b9f3a7ce..2b94e75a0a8b 100644
--- a/offapi/com/sun/star/view/XPrintJob.idl
+++ b/offapi/com/sun/star/view/XPrintJob.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_view_XPrintJob_idl__
#define __com_sun_star_view_XPrintJob_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
#include <com/sun/star/view/XPrintable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
index 54335f834a51..540b2f746a03 100644
--- a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_view_XPrintJobBroadcaster_idl__
#define __com_sun_star_view_XPrintJobBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintJobListener_idl__
#include <com/sun/star/view/XPrintJobListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintJobListener.idl b/offapi/com/sun/star/view/XPrintJobListener.idl
index 74e6431e2848..e072d262d39c 100644
--- a/offapi/com/sun/star/view/XPrintJobListener.idl
+++ b/offapi/com/sun/star/view/XPrintJobListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_view_XPrintJobListener_idl__
#define __com_sun_star_view_XPrintJobListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintJobEvent_idl__
#include <com/sun/star/view/PrintJobEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintPreview.idl b/offapi/com/sun/star/view/XPrintPreview.idl
index dfc242753788..1e9697911006 100644
--- a/offapi/com/sun/star/view/XPrintPreview.idl
+++ b/offapi/com/sun/star/view/XPrintPreview.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_XPrintPreview_idl__
#define __com_sun_star_view_XPrintPreview_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
index 349710d3b3cf..2cb5ff6d84da 100644
--- a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
#define __com_sun_star_view_XPrintSettingsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintable.idl b/offapi/com/sun/star/view/XPrintable.idl
index f4bf1a5c5867..dfd02987a9a8 100644
--- a/offapi/com/sun/star/view/XPrintable.idl
+++ b/offapi/com/sun/star/view/XPrintable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_view_XPrintable_idl__
#define __com_sun_star_view_XPrintable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintableBroadcaster.idl b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
index ab95537cd274..f0ed19d403a1 100644
--- a/offapi/com/sun/star/view/XPrintableBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_view_XPrintableBroadcaster_idl__
#define __com_sun_star_view_XPrintableBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintableListener_idl__
#include <com/sun/star/view/XPrintableListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintableListener.idl b/offapi/com/sun/star/view/XPrintableListener.idl
index 179e4c6e53f7..82987d42c2bc 100644
--- a/offapi/com/sun/star/view/XPrintableListener.idl
+++ b/offapi/com/sun/star/view/XPrintableListener.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_view_XPrintableListener_idl__
#define __com_sun_star_view_XPrintableListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
#include <com/sun/star/view/XPrintable.idl>
-#endif
-#ifndef __com_sun_star_view_PrintableState_idl__
#include <com/sun/star/view/PrintableStateEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XRenderable.idl b/offapi/com/sun/star/view/XRenderable.idl
index 01c874e0e7ad..84d59bca1e78 100644
--- a/offapi/com/sun/star/view/XRenderable.idl
+++ b/offapi/com/sun/star/view/XRenderable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_view_XRenderable_idl__
#define __com_sun_star_view_XRenderable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XScreenCursor.idl b/offapi/com/sun/star/view/XScreenCursor.idl
index 6a4b520d52c5..6c40db224379 100644
--- a/offapi/com/sun/star/view/XScreenCursor.idl
+++ b/offapi/com/sun/star/view/XScreenCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_XScreenCursor_idl__
#define __com_sun_star_view_XScreenCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XSelectionChangeListener.idl b/offapi/com/sun/star/view/XSelectionChangeListener.idl
index 91e9d72d17c1..5c28cd0acd66 100644
--- a/offapi/com/sun/star/view/XSelectionChangeListener.idl
+++ b/offapi/com/sun/star/view/XSelectionChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
#define __com_sun_star_view_XSelectionChangeListener_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/view/XSelectionSupplier.idl b/offapi/com/sun/star/view/XSelectionSupplier.idl
index 84ed18ee8287..379866a3390c 100644
--- a/offapi/com/sun/star/view/XSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XSelectionSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#define __com_sun_star_view_XSelectionSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
#include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XViewCursor.idl b/offapi/com/sun/star/view/XViewCursor.idl
index 5d5b855a357f..2c3d5f836c44 100644
--- a/offapi/com/sun/star/view/XViewCursor.idl
+++ b/offapi/com/sun/star/view/XViewCursor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_view_XViewCursor_idl__
#define __com_sun_star_view_XViewCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/view/XViewSettingsSupplier.idl b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
index dbcedcda2c17..4cd91affeccd 100644
--- a/offapi/com/sun/star/view/XViewSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
#define __com_sun_star_view_XViewSettingsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/Binding.idl b/offapi/com/sun/star/xforms/Binding.idl
index 3c6006e59f70..5950f994c0c6 100644
--- a/offapi/com/sun/star/xforms/Binding.idl
+++ b/offapi/com/sun/star/xforms/Binding.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_xforms_Binding_idl__
#define __com_sun_star_xforms_Binding_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
#include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
#include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidator_idl__
#include <com/sun/star/form/validation/XValidator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
index 62174ddb8573..572541513e82 100644
--- a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
+++ b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
#define __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/XDataTypeRepository.idl b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
index f2c2f1d2fd67..b29f59328b80 100644
--- a/offapi/com/sun/star/xforms/XDataTypeRepository.idl
+++ b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_xsd_XDataTypeRepository_idl__
#define __com_sun_star_xsd_XDataTypeRepository_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/XFormsSupplier.idl b/offapi/com/sun/star/xforms/XFormsSupplier.idl
index 066cabc4918b..83c78df805e4 100644
--- a/offapi/com/sun/star/xforms/XFormsSupplier.idl
+++ b/offapi/com/sun/star/xforms/XFormsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xforms_XFormsSupplier_idl__
#define __com_sun_star_xforms_XFormsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
index 1529c75fdcba..281d2c8378f8 100644
--- a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
+++ b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
@@ -27,41 +27,16 @@
#ifndef __com_sun_star_xforms_XFormsUIHelper1_idl__
#define __com_sun_star_xforms_XFormsUIHelper1_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
#include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XModel_idl__
#include <com/sun/star/xforms/XModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/XModel.idl b/offapi/com/sun/star/xforms/XModel.idl
index 93948412e22c..f7319f223aa0 100644
--- a/offapi/com/sun/star/xforms/XModel.idl
+++ b/offapi/com/sun/star/xforms/XModel.idl
@@ -27,37 +27,15 @@
#ifndef __com_sun_star_xforms_XModel_idl__
#define __com_sun_star_xforms_XModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
#include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xforms/XSubmission.idl b/offapi/com/sun/star/xforms/XSubmission.idl
index a7c11f661666..21775d3a7517 100644
--- a/offapi/com/sun/star/xforms/XSubmission.idl
+++ b/offapi/com/sun/star/xforms/XSubmission.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xsd_XSubmission_idl__
#define __com_sun_star_xsd_XSubmission_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
#include <com/sun/star/form/submission/XSubmission.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xforms {
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index cd4c9dec0a6b..d47fdc266d3b 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index 21b5ece2b6d1..3531b649df97 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#include <com/sun/star/xml/XExportFilter.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index d95c7c099bf3..82b6f1a91cf6 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#include <com/sun/star/xml/XImportFilter.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 03319c029fa4..77d6224cd6ce 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 9d85e30bb255..eb230ecbba6a 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index cde995ba8872..f0022b1a0d96 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index 515ed93f7b07..105867aecf1f 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a90a0f06609..24224119b645 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index 89e597977f35..caa0364ab750 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index 68646ba9f982..f952a01b91b4 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index c66b6cb3bc60..81b94a27ce44 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_xml_XMLExportFilter_idl__
-#ifndef __com_sun_star_document_ExportFilter_idl__
#include <com/sun/star/document/ExportFilter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index 6e551859f720..05cf2718e264 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -29,13 +29,8 @@
#define __com_sun_star_xml_XMLImportFilter_idl__
-#ifndef __com_sun_star_document_ImportFilter_idl__
#include <com/sun/star/document/ImportFilter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index 1f914194f45e..c6f9c4c825d7 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XSEInitializer.idl>
-
#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index a2ed14038934..4cefdc02a94e 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 9e664894ee1e..c48c87ddf84f 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index a379bfc84386..292bf71db8e9 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
#define __com_sun_star_xml_crypto_XMLEncryptionException_idl__
-#ifndef __com_sun_star_security_EncryptionException_idl__
#include <com/sun/star/security/EncryptionException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 1d512dcd31d8..2b4922678795 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index 9acf52b38802..dc9a7665ab27 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 8eea2d51e62e..dddccae400d0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignature.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 193c5417db43..ab0613f56026 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
#define __com_sun_star_xml_crypto_XMLSignatureException_idl__
-#ifndef __com_sun_star_security_SignatureException_idl__
#include <com/sun/star/security/SignatureException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 0116afa64006..18379a0c58a5 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 25d7264c22d3..b8743599c0a0 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -32,10 +32,7 @@
#ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
#define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/security/XCertificate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 8af4769c362e..26ef95f118b9 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -35,13 +35,11 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLEncryptionException.idl>
-
module com { module sun { module star { module xml { module crypto {
/**
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index 6953ba743c71..459104e357df 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 7ab002c21e1d..ec9190cf6a3e 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/security/SecurityInfrastructureException.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index 28180a2a23ec..66f4a1b4d2a6 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/SecurityOperationStatus.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index 8d9d5e44706c..325531fadab1 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLSignatureException.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index f89542c02f77..c5ad60db790a 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index c3f2d095e208..1e51568d0628 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XBlockerMonitor.idl"
#include "XDecryptionResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 7c37884f4fbd..536efe61c831 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XBlockerMonitor.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 28fc6e8bf037..a85d9dcc0af9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -34,11 +34,9 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XSecuritySAXEventKeeper.idl"
#include "XReferenceResolvedBroadcaster.idl"
#include "XSAXEventKeeperStatusChangeBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 65622d20ff5e..0cf2cc075a13 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -35,9 +35,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureCreationResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index 6e78a9340431..2b06ae7b07f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -36,9 +36,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureVerifyResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index 30f53c30ee0a..d59e037934ab 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index d344af889bbe..3e5857c32f19 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_DOMException_idl__
#define __com_sun_star_xml_dom_DOMException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
#include <com/sun/star/xml/dom/DOMExceptionType.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
index 0804dc6df201..d280f01833ab 100644
--- a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_dom_xdocumentbuilder_idl
#include <com/sun/star/xml/dom/XDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
service DocumentBuilder
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4c9dffd36dda..c530d479ead2 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,11 +1,7 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_sax_xdocumenthandler_idl
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl
#include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 7d4a010e3723..6737645e0ac7 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XAttr_idl__
#define __com_sun_star_xml_sax_XAttr_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index a484ccabca34..dae54a750922 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#define __com_sun_star_xml_dom_XCDATASection_idl__
-#ifndef __com_sun_star_xml_dom_XText_idl__
#include <com/sun/star/xml/dom/XText.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index 380c705d6359..af2767faa3d6 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#define __com_sun_star_xml_dom_XCharacterData_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 36a6a6e6afe7..95fd6ebeb199 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XComment_idl__
#define __com_sun_star_xml_dom_XCComment_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index f8003fce26e2..56f7ceda68e6 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#define __com_sun_star_xml_dom_XDOMImplementation_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 6bd105d8e06c..d64eb18fc290 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -28,33 +28,15 @@
#ifndef __com_sun_star_xml_dom_XDocument_idl__
#define __com_sun_star_xml_dom_XDocument_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#include <com/sun/star/xml/dom/XCDATASection.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__
#include <com/sun/star/xml/dom/XComment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
#include <com/sun/star/xml/dom/XEntityReference.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#include <com/sun/star/xml/dom/XProcessingInstruction.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index e2245e9d3153..a72625c6cfd6 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -28,35 +28,16 @@
#ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index cbc8af63b923..5a48224e4b23 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#define __com_sun_star_xml_dom_XDocumentFragment_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index ce6495214bcf..cd4c46573ce5 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#define __com_sun_star_xml_dom_XDocumentType_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index dc0373467a53..f0869b708124 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XElement_idl__
#define __com_sun_star_xml_dom_XElement_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 7396a42aa190..3352ae002a49 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntety_idl__
#define __com_sun_star_xml_dom_XEntety_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index cec97fdf0219..9650fbe55854 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
#define __com_sun_star_xml_dom_XEntetyReference_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index df7ed658ad56..c09a63e0c83b 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#define __com_sun_star_xml_dom_XNamedNodeMap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index 7f7ffc14aa0e..b60a24796f52 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_dom_XNode_idl__
#define __com_sun_star_xml_dom_XNode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__
#include <com/sun/star/xml/dom/NodeType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index 7c8ae6c85326..13ae64f35628 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#define __com_sun_star_xml_dom_XNodeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index 6198cdd491e9..415e7da0d5d6 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNotation_idl__
#define __com_sun_star_xml_dom_XNotation_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 48277fc4a5c8..cf329f8c3988 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#define __com_sun_star_xml_dom_XProcessingInstruction_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index 05fafa20fc9f..7b84712eb06e 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -28,19 +28,10 @@
#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__
#include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 8d12d1466cdd..bc009f2f65cd 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XText_idl__
#define __com_sun_star_xml_dom_XText_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index e05e7c7623d2..e1a04208037c 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_dom_events_EventException_idl__
#define __com_sun_star_xml_dom_events_EventException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index 724ea388fd75..f1ccdde43798 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -32,7 +32,6 @@
#include <com/sun/star/xml/dom/events/XEvent.idl>
#include <com/sun/star/xml/dom/events/XEventTarget.idl>
#include <com/sun/star/xml/dom/events/XEventListener.idl>
-
#include <com/sun/star/xml/dom/XNode.idl>
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index fae70b3c84c0..c5d1b7ab4b7b 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_FastShapeContextHandler_idl__
#define __com_sun_star_xml_sax_FastShapeContextHandler_idl__
-#ifndef __com_sun_star_xml_sax_XFastShapeContextHandler_idl__
#include <com/sun/star/xml/sax/XFastShapeContextHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index baec31bb7fb9..9a1d74bf4da8 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastToken_idl__
#define __com_sun_star_xml_sax_XFastToken_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index d9004b08b1eb..5445d6dfb294 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_InputSource_idl__
#define __com_sun_star_xml_sax_InputSource_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index e7257352fa45..649403ff0d29 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXException_idl__
#define __com_sun_star_xml_sax_SAXException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index 9b415b3119fb..3f1c6f2a052d 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
#define __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 2c56716fa683..c306472f69ac 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXParseException_idl__
#define __com_sun_star_xml_sax_SAXParseException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index f7b24418410d..e671c6eb997f 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#define __com_sun_star_xml_sax_XAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 184850386f11..44168ac406fc 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#define __com_sun_star_xml_sax_XDTDHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 6586ba99a66b..210b8c6ec557 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#define __com_sun_star_xml_sax_XDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#include <com/sun/star/xml/sax/XAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index 63547e260fa8..c850f3e702e1 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#define __com_sun_star_xml_sax_XEntityResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 2d799fc6afdc..87a4b33dfe8f 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#define __com_sun_star_xml_sax_XErrorHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 5801a22a2517..d1f04f801b4a 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
#define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index ad991568d738..baafcc24e435 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#define __com_sun_star_xml_sax_XFastAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_Attribute_idl__
#include <com/sun/star/xml/Attribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_FastAttribute_idl__
#include <com/sun/star/xml/FastAttribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 1449e3fbc4b5..19c71e696d1a 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#define __com_sun_star_xml_sax_XFastContextHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index af9e2b2aef41..a9e2e74dcced 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -27,25 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#define __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#include <com/sun/star/xml/sax/XFastContextHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index e2e2d1e31418..9aa53a7cc01d 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -27,49 +27,25 @@
#ifndef __com_sun_star_xml_sax_XFastParser_idl__
#define __com_sun_star_xml_sax_XFastParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index 949d8ef2386b..aa35a92a9896 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
#define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Pair_idl__
#include <com/sun/star/beans/Pair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index 5d1591490bb5..fa747d3d8474 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -27,26 +27,11 @@
#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
#define __com_sun_star_xml_sax_XFastSerializer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index 0f1063479edc..68fe416663c8 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#define __com_sun_star_xml_sax_XFastTokenHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index e77d83000f8a..81139a153b1c 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XLocator_idl__
#define __com_sun_star_xml_sax_XLocator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index 0d29af5d6562..bab4475f1229 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -27,41 +27,23 @@
#ifndef __com_sun_star_xml_sax_XParser_idl__
#define __com_sun_star_xml_sax_XParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 94af79fc1444..065fec06668b 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
#define __com_sun_star_xml_sax_XSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index db7753848ff3..e5aa2075e232 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 2dc7103458d9..9f457bff5ac1 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 67d771b3ea66..99842d95492f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathAPI_idl
#include <com/sun/star/xml/xpath/XXPathAPI.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 37ee4eb789bb..2c36d2668745 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#define __com_sun_star_xml_XPath_XPathException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index d286cc0a817e..e5c827b84b2f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index 62ac4c32d984..6a19b545c2da 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_xml_XPath_XXPathAPI_idl__
#define __com_sun_star_xml_XPath_XXPathAPI_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathObject_idl__
#include <com/sun/star/xml/xpath/XXPathObject.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl__
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#include <com/sun/star/xml/xpath/XPathException.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index 527c37ba46f3..016439e6c78e 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_xml_XPath_XXPathExtension_idl__
#define __com_sun_star_xml_XPath_XXPathExtension_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
#include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 8e5f33bbbbe0..a1ef71ff8762 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
#define __com_sun_star_xml_XPath_XXPathObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
#include <com/sun/star/xml/xpath/XPathObjectType.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xsd/Boolean.idl b/offapi/com/sun/star/xsd/Boolean.idl
index da715bc6ee22..6c3a409add2e 100644
--- a/offapi/com/sun/star/xsd/Boolean.idl
+++ b/offapi/com/sun/star/xsd/Boolean.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_Boolean_idl__
#define __com_sun_star_xsd_Boolean_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Date.idl b/offapi/com/sun/star/xsd/Date.idl
index 624f6af4ca2d..3c01b978db1e 100644
--- a/offapi/com/sun/star/xsd/Date.idl
+++ b/offapi/com/sun/star/xsd/Date.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xsd_Date_idl__
#define __com_sun_star_xsd_Date_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/DateTime.idl b/offapi/com/sun/star/xsd/DateTime.idl
index 06b7c945baf8..3a88a167c8f0 100644
--- a/offapi/com/sun/star/xsd/DateTime.idl
+++ b/offapi/com/sun/star/xsd/DateTime.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xsd_DateTime_idl__
#define __com_sun_star_xsd_DateTime_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Day.idl b/offapi/com/sun/star/xsd/Day.idl
index c683ad3ebb4a..e63831fe0f09 100644
--- a/offapi/com/sun/star/xsd/Day.idl
+++ b/offapi/com/sun/star/xsd/Day.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_Day_idl__
#define __com_sun_star_xsd_Day_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Decimal.idl b/offapi/com/sun/star/xsd/Decimal.idl
index 008fb9340b82..886493b45fbf 100644
--- a/offapi/com/sun/star/xsd/Decimal.idl
+++ b/offapi/com/sun/star/xsd/Decimal.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_Decimal_idl__
#define __com_sun_star_xsd_Decimal_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Month.idl b/offapi/com/sun/star/xsd/Month.idl
index bc57ed265bfb..36d83591d8fe 100644
--- a/offapi/com/sun/star/xsd/Month.idl
+++ b/offapi/com/sun/star/xsd/Month.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_Month_idl__
#define __com_sun_star_xsd_Month_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/String.idl b/offapi/com/sun/star/xsd/String.idl
index d5d5f029a17a..190368a69f34 100644
--- a/offapi/com/sun/star/xsd/String.idl
+++ b/offapi/com/sun/star/xsd/String.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_String_idl__
#define __com_sun_star_xsd_String_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Time.idl b/offapi/com/sun/star/xsd/Time.idl
index bca39677b8cd..033c804605d3 100644
--- a/offapi/com/sun/star/xsd/Time.idl
+++ b/offapi/com/sun/star/xsd/Time.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xsd_Time_idl__
#define __com_sun_star_xsd_Time_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/XDataType.idl b/offapi/com/sun/star/xsd/XDataType.idl
index b3009756e92c..f063167ea133 100644
--- a/offapi/com/sun/star/xsd/XDataType.idl
+++ b/offapi/com/sun/star/xsd/XDataType.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xsd_XDataType_idl__
#define __com_sun_star_xsd_XDataType_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {
diff --git a/offapi/com/sun/star/xsd/Year.idl b/offapi/com/sun/star/xsd/Year.idl
index 3e4a3438acec..a351b3130297 100644
--- a/offapi/com/sun/star/xsd/Year.idl
+++ b/offapi/com/sun/star/xsd/Year.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xsd_Year_idl__
#define __com_sun_star_xsd_Year_idl__
-#ifndef __com_sun_star_xsd_XDataType_idl__
#include <com/sun/star/xsd/XDataType.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xsd {