summaryrefslogtreecommitdiff
path: root/offapi/com
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
commit0843dc709d9d2743a2e0010d00d8ad8a64cdd663 (patch)
tree1dea749ff89a4db5ed79aa3787f5296e5320379c /offapi/com
parent18d161a4f506fa0f57888d2fbb51ae91e4ec85c6 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com')
-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.idl3
-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, 3 insertions, 16175 deletions
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index e9b441efc..895f68009 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 d50a35284..96e9b5f12 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 d948a3e2f..0936faf51 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 9ba1a51da..ba6e532d0 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 9cb78aac9..36b48d65c 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 afd9928bf..c3dc10f09 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 1270283f0..37d7c5741 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 3c2d14afb..2ac39d59d 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 7914a9605..c45340bfb 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 ff0d33356..dab8ec171 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 f05c7b659..79781bd22 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 bd76259dd..c1cc33e1c 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 ef31c6500..5746f4778 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 3505919bc..71636fe3c 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 b80a5b195..63ff20296 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 94315f721..4e823c5b3 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 83df1f263..839f3b963 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 9e0310308..e0b80cc98 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 e35afc5c6..9bad240d2 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 f0e8cc25e..9fcbf6dc4 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 d7a8d006f..0e23d6185 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 89a7d7a09..a0df1a16c 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 46d4e022f..7be269a8e 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 a68c8cd74..d0a5e4182 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 241d2779f..5cdec2260 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 b7bedfa33..288311451 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 96921e3f7..6740cd802 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 44eb5f1f7..940ed83c6 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 e450bd749..5ece66798 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 01f4a2fd7..420d3a398 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 42b154f1d..c3d047638 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 6db771acf..5f9913f66 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 03789dcca..ed45a02f2 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 c885282db..151cfe7e8 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 c216a6d72..d9d9c772f 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 597f9cba0..5641e7624 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 6f8014e8b..0493c24cb 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 1aa29eff9..35cf52e38 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 e92b272a0..8cdb6b9e4 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 ff03c57a9..55fa0cf10 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 40ed239dc..0ef5d5569 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 a45c24a6f..a49c5be52 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 b4df2e526..fd5e4a400 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 1f6a0ecdb..fdbdd1648 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 164fcd7f7..cd4255e49 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 ff0704a05..461080ec7 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 106f6c4b3..d8427a09a 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 bc3a84779..4a780823c 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 87633e075..6cb6b0a0f 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 071a8e106..c94b2e637 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 9fc84c7f8..00556d6d7 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 3c30a2805..06fd996e8 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 fab593716..12101ee8c 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 3bb6706a9..1a2dac0cc 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 ef8a7317b..0f1841375 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 fa7cfe9a8..67e02b27b 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 fa683d41c..6aef9625b 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 ca1c00d8e..5cca7ab9e 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 2ee05f746..d3f163322 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 bb6aa60c2..8a57b15b4 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 1e598601b..aa88791ff 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 292c26116..eb5b46c67 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 476f21470..6acab23a1 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 c3fa8d126..f4802185f 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 9bd8c63de..b091b41d9 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 28822d5f4..dd527d09b 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 af6b1b5a5..6134d596e 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 271ea2d6f..982ad57bf 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 e3d400f81..faf389940 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 2dfe53075..ba21330a1 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 69333995e..ea5aede19 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 8d942198f..946cff6d8 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 7579cbb9d..efbc73569 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 29ea2bd6c..03b6dc94b 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 a2cbc1062..06a13a66c 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 8790bc04b..722333872 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 62600eb87..d93efc4ad 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 08323f60b..e6ba6e071 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 b4bd6809e..69c0a6169 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 cc801baf9..071300c70 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 8342b76f8..6291880ea 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 df8e43d24..6f3fc09e8 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 91bb00a24..90ccf65cc 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 e5e3871bb..b2804d4fd 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 c35575857..1d8397e1f 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 232acaae4..d20977d04 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 2a62c81ac..5794776a0 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 e1b812e0c..f1c10b479 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 3c8a69dec..64bd8f400 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 660c47559..92b289a47 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 3c1fe7429..4ed0e06d3 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 d7f1a1438..7f01ee137 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 e803d70a2..f1fa5165d 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 f108eb9c8..4b7ed4084 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 c3b6ab599..4fe013aa6 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 a3565c797..dfa5d8c80 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 3312cdf55..c0d5fe6eb 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 a2919f690..cecda52a0 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 3bba6a186..4933ff34d 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 f033adc46..727ffd96e 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 dad7c536b..edaf24456 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 402be4f99..71682a5e5 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 45d1401e0..7069e318b 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 8911d03a9..c3d3971cf 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 af50dc9b6..c0b95142d 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 1383cb5d3..c0234ec29 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 603dc2699..48a8bb5c8 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 a012b8ffe..0ce60e408 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 3fb7d9073..0fd81cb8d 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 faaab666f..9c595a038 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 b7077f9b6..f2418bb3a 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 799bf3592..84d2812aa 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 785c45fbc..f3d6df685 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 67d10b235..e52dea9f0 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 75f331ee7..d2b847983 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 d2f28c70d..2ada2e49c 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 4a11586cd..d4a6c4ea6 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 a9319242a..d218c9c2d 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 def18cd36..c50d1f846 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 106aedb02..02af32239 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 589e80428..d774efb1c 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 646d62849..70df99790 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 e42122285..cc54009b1 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 29f6dc42f..8cebcea58 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 f395350a2..77ce44948 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 4ad296ca6..0c33e871c 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 3709a2e5b..41e556081 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 6e0d10fb9..952c7df5c 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 6f09cdf82..d441babc7 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 9f59040ae..ec0bdfd13 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 eb7caf147..5fc18d07f 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 e278777fe..57247a35e 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 fea807ad8..71ae30b0a 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 960d4f006..4733de6c9 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 c3b0b1795..e812a3dd5 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 a4b8b9887..2baec7f7d 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 efb5ecbe5..e5b1f88eb 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 aab83a142..a8a1e6a7c 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 39b2eac88..42ed19e40 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 70505ad82..34e5993a7 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 0a9c8d5e0..d12205630 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 1c70e95f6..dcc3bd387 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 59b024bdd..4bacd2b32 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 a25145e40..17c446295 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 12befafe2..2fa9c4873 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 edf434116..8f65572ec 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 a55c9e926..8c943e0c5 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 bfa6b87f3..f4f70ce3f 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 77b3576e6..d0ddb77cb 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 640e5bbcd..a62832c96 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 cca77e38f..860d74052 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 2b5697804..ec7f6f664 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 05087a7bf..d5ed5d0fa 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 6fa119114..4432488f2 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 5c489ab2b..4b0698ca9 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 2fe63db7c..ff9da9bf7 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 43d2d097c..40e896042 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 991380a96..fb74f15de 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 e1756a82a..0e9dbe4ae 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 f06fee56b..0464f263d 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 428693b2c..aaa89d86d 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 5318ebd03..3f7e7625f 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 01dace2ec..5181681d5 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 89422d00b..27efb186e 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 08257d435..661dd13eb 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 ad2c50e20..7ee42d3b1 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 06d63c97a..255b69ec3 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 7e38d5595..18cbef481 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 8adfca00a..5f2d64386 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 c3ac46091..12eef77d1 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 fd62671be..bd9ee7caa 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 4a41c72b2..5e452d1f9 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 bcbdb068e..b370bce45 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 bc73e10e1..629c99402 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 2cf1d8e96..86ee312a7 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 65de4c5ee..91a7f23ce 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 ebe192cf8..4106ca38b 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 a353dc067..313354a1d 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 662aa4d24..59412b640 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 51880a010..ce52e5f03 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 d6baa54ca..2465a68e8 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 467be2fd0..c634220b3 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 99ed50f7f..43a6126ab 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 ce3bd7cb6..ddfa6ad8d 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 ea29a083b..b31a1f93a 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 fc3fcab67..88c5d89c1 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 bc1f0697d..d089ed785 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 fea57d85a..ac6ab3b7f 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 3a51bceef..9056daeec 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 9f51fe987..3ddf873de 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 bd77db0d8..6cbd5ea61 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 661d64c22..d91e60843 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 c0cc57a3f..67ebee905 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 a0d6990a5..20b08728f 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 5a44f9086..7cf1580fc 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 8d897bbe0..7a3866b53 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 594f072fc..16ef382eb 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 3f7595a15..fbc9faf77 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 955f69860..d721dd4ef 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 a8ce13c3e..3b7d645dd 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 e04f2590d..1b7de431f 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 1e9f9113a..58676f78d 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 18a40c451..6ad34e441 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 371c4de96..93b92fcac 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 3f2d57866..1989752c4 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 116c52afa..9b7f7a2a8 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 bea7e879a..099eeb252 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 241a0f340..d1aa68148 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 7cf8e18b4..88a6f0879 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 b4e269600..14157c262 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 dd3ab0270..f0ea7c05c 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 71a139ae7..d0c72621a 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 fe0ecd5e6..39554b855 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 f63ed2311..47df500e3 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 92463ebbb..d29bc50a8 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 30c9146e2..8bc457022 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 3d2fc0c7a..930015b5a 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 817e44965..83f752f6b 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 986597486..7f54ffe74 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 714eea13e..07a38b015 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 aff32301e..38e7a26f9 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 d07a31180..138bdd571 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 bbb3c6b1a..abb0ae9d2 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 bea70db11..ab8d661b2 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 107d7e919..06b34262d 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 fdd01dd9c..c29681d1a 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 8763965ee..0bbd15387 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 42cd6b6f7..801427c22 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 8847b7350..be334a78a 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 c3601da09..d5ca6ae92 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 3caa554c5..7d45ea8ff 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 262032fc1..680dd665d 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 033de9add..5c6d08396 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 87162cf32..7f4ceb51b 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 1610e10bd..ffd4721b9 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 ba2f954d6..49ed66aee 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 6af2742d6..0316e9ddf 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 f85a71d70..fcbebf634 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 c9ca8e480..865f6cd16 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 8751ecf80..6eb70abff 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 3482bdb72..54d88efe7 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 135234e4a..87cc2c013 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 b34e0c25a..8c9bb6dd8 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 983c46184..7935bf756 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 b92b17596..03da3c94a 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 4786ae3dd..09079448f 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 b90bfcac9..ea6fc0803 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 5b1ed3d29..ce4e2f925 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 78e550e7b..8e1ef0dfd 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 340e26903..aa596fc94 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 fb51b1880..f9a34699a 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 73261eb76..1ef1f91ee 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 515071f44..fef8f601c 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 65d688d45..3b843fba9 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 aa892845a..88b448612 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 83c1a67b3..3b3de4a9a 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 9e172cf8b..e00877362 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 0dd3c566a..456014f71 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 ed41231b6..78ec904cf 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 28587336a..cd9c05fd8 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 f4ebdc0ec..563d035c8 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 f9ac89025..571e858e7 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 77decad4b..b5e7b803c 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 71d3f086f..95fba2a84 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 5f9d1a136..a8f3547df 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 f4a9af7f0..d3a8030bd 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 67522ed57..171e8fe93 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 bbec7a7a8..d3ed37a64 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 b2d4b27b7..609ed21fa 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 3357acf88..4c4914a38 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 6eccbacab..b3e53362e 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 e04453c51..d9467a03b 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 424861edb..333eb0ad6 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 c102a5591..dc9507b7a 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 5b551687a..05955a5c5 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 cb3a6d2dc..0d8ca65da 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 31bfe04d1..c73289626 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 89ae2115a..1ed756d79 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 c6b0a8350..4a5494798 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 7b572e25a..a0dd28d40 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 cfecff9d9..704a38356 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 5f544bf7c..822c09bf1 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 9b41dd602..137717c34 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 b3ec1e68e..185848a05 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 d0d14c5e8..622498a2d 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 3cbb9c5b6..9bded4c85 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 801cb6a86..f92f8cbb4 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 e755c02dd..3267b71ac 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 3119cb9c2..7c2175067 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 65336239a..de5f9e3a7 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 58a4ac8cd..ee69fb0a4 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 b07a20121..fb4b47cac 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 79cfce91b..be4f9f0d1 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 fe6c93f7a..53acb0995 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 62c22afbe..da2a719d0 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 d48cb1f42..52c440759 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 6802e3c86..af5ba4c1c 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 dbb13a958..ad79ceb1f 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 97d8131d6..b8154e68c 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,14 +30,13 @@
#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>
#include <com/sun/star/lang/IllegalArgumentException.idl>
//=============================================================================
-
+
module com { module sun { module star { module awt { module grid {
//=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index d8bd7065f..74b29f585 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 43c6197ec..ae2bc7c67 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 be399c34d..9eaef7e0f 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 69e0a1004..786f985ba 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 e0f38adeb..2566847cf 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 1f506cad1..ebd818893 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 a534b52f1..8ac2cd0d9 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 40436e4d7..be04fdb8a 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 2e372ef14..ff9cf1239 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 333c10353..9e637ac0f 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 4b8963e18..b9791f77f 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 b8c83ab6f..d52760bc7 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 443698776..b1efa9cba 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 53338d5ac..d04860e9a 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 e1c1dd58c..0e0f6c7cf 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 572a15d81..294917b6a 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 6e6501f02..a0617f9e2 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 d47ccc607..2c651cae2 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 85638a22f..7d427b6be 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 6f319aea1..e3d772edc 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 b8c285048..a0c76ee56 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 e3eeee598..43d16a2e1 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 9d91c13df..175077982 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 3d90ed27f..b62112219 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 cab628733..44f4a40ec 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 97110b5d7..f80c77170 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 28d7f784b..ba3a6f092 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 009b8259d..1986c0479 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 a9c5bcc14..004774cc2 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 a0361d27b..006f03036 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 8540a7929..29de42c2c 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 03ced44b8..7c2c9a1ac 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 538f0f0c1..eac7a643f 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 9781baa33..e446c2e23 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 0e6b105a3..71673e634 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 77c310ce0..696e0982b 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 a45ebeb30..c817cb171 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 a999e613d..0cb2f3888 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 b9635f84b..b3935762a 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 04081a02e..81d096ccb 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 c9d4111b2..10f883a5b 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 149648854..bf9d60329 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 37cb0bd67..fec5182c6 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 aaba6bc70..0c43589d5 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 7a0abf7dd..c2e70d737 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 60b4aa414..dd356e963 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 639068d80..4d6102077 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 d012e832e..a7c20db64 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 50dc0bc19..26e6d6f05 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 1a136ae9c..6f86873c5 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 b21648357..e823a58ee 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 4670ed7f1..6693a305b 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 f79b9a5bb..ae1ccab33 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 3e7da9fda..c6a617507 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 915f0a912..ac5d4f0fe 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 3c6718a0b..072412d9b 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 9a1503aa7..d6335325b 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 43701ca10..245f7c619 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 974af5088..42a8b1ff1 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 e994516a4..307198d20 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 ba611ecaa..ad7c46463 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 64426705e..76044b7cd 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 8c7e8f932..7b44da41e 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 f021afbdd..39e49b3e3 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 32c2fdce1..b16a72857 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 930feae28..01f4b00d3 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 6a1cb0432..01b9fe9dd 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 5b7da27a5..33b48bcea 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 9f1009e33..527f58e2f 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 0b71d6923..2e2ee24a0 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 d6a05afa4..37e6ce793 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 44753229f..d08044fc1 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 8b0ff9342..37b6d8a0f 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 c552a4d7b..16e8fd41c 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 c2f3f1c25..fe7216cd7 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 73c47039f..c6b5d4855 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 17db847c8..b74aace0e 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 bdfa2d8bc..f2ea3e8d8 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 6e309dc72..7c19752fa 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 16b0b1f2f..a6364024a 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 3b75f89cb..fec55fe12 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 6ac775831..58a65f992 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 96e61f18a..472df59a9 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 5c9c094ad..1916425e5 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 3a6b51a82..dbcd4a38c 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 40a4c1ead..3bd908a6f 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 37a488afe..28e39050a 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 ee0e9154a..35c18519a 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 72269798b..dc6f07cb9 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 ae2e95c6f..84b0b799c 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 32382467e..bd87603df 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 11f509170..4e0357164 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 24fafa99d..40c7de726 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 90a64c550..d1d2f1df8 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 7c4e9d431..3897f3a94 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 5651f7a32..9e0e86c16 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 c58f35023..669aadabf 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 f7505e030..e32e8f47b 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 07f358b2a..6dce9a1e1 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 8b153c865..2701739d4 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 efc9e7a12..bc2b23d3e 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 afb241f57..890b90a03 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 90f498e03..c036c5a47 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 0f455202f..554c9fb70 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 ace1d9459..6f4857e44 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 08840668b..a2ff114ab 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 10691d557..a65008d0b 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 f7a59ddac..5b102ffab 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 fe8183208..78998ae69 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 128dd08cb..d16f1c6f8 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 ec7ac4691..ee6b40e42 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 5928f41f3..6c6338f41 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 e9e19e3a5..9f9e24dc8 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 406b57dc3..f75497205 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 10960d9a4..98d5ee75c 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 3a1c52a4c..23802b418 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 569f29ff2..b68ee3aea 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 8036595ef..97a02c495 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 e41afe75f..65ea3175d 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 7ba39af8a..100a226be 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 ba9d81234..9d3d0b5e5 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 4459d54c8..f3e26c9cf 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 36f9167f6..765cad6a6 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 d2d40f00c..c29d92670 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 0adc3d5f8..a66619956 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 bc84d95b1..66b188f14 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 a3ea105ad..9fdb22d0c 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 a6b95297d..e2ea022d2 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 afa956be0..833769748 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 fe23fa0ff..1443d0c23 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 cda31e80a..12606ca7b 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 572275ff4..7a1855b41 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 21f318569..a14ee8d07 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 2c1f37ff1..33d2e16e5 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 c74016d76..ba1073bd0 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 fd4ffe8c9..a48f31111 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 27e9d09f5..da5e4e03b 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 fd8ec35e3..362b498db 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 14bd759ae..eab0fe361 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 6767063af..8cc31a47c 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 180696aee..ead0a96b4 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 15068860f..455c7bec3 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 c834f09ae..ff9c25525 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 b0a18ae6e..f019bb90a 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 580a48663..702ca743c 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 3d4e712fa..e323aa38b 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 5fd594390..bf084823c 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 5c70af4cf..0ddac5ca4 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 dde8be258..4cb57eb14 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 c2548c2ee..f787223db 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 9a5448601..0aff67b4e 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 8dd32e0ed..532dca2a2 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 c0063753f..62ba14475 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 2e51ae768..5ba815e48 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 d185183da..b63571a9f 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 1ad7308db..697b97932 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 e2b32fdbf..7a71102c3 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 82bec312a..20e65b10f 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 38c28c25c..2e97f3236 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 cfe15292b..63c741cda 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 dfb881b76..cad0641e9 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 3e94c6959..640412e1b 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 965f19673..9fff1fa4a 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 c4e792728..e19dae5ce 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 e39e89425..c7e377087 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 4f3507b94..97f46385c 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 45c445f6d..53a54c6c3 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 f56bde412..69e91932a 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 4cd33be6b..8fca55745 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 8d5f6cbc6..6cba46f9a 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 2a21eec34..2087ae74c 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 ffa243b70..958ff8c0a 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 31d67ca07..581cbdf68 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 79d25f588..cb7ed8c61 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 9666dfb22..2d013a605 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 c4520007e..0612a17ce 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 2b0c3566e..43e46ac36 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 8cec9f9d5..9cc952217 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 f2f823e9a..c18553360 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 5b34c1988..409204b6a 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 b2e5eb5e0..3fe73010e 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 035616fa4..a0cb8cc3e 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 29a125aa6..b81c2e728 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 8f5d06d86..465618338 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 039a2146a..56a43a762 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 e3b75ff3a..71ec64914 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 46502afb8..cff7546a7 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 ae92e6580..d76006de5 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 a8b2d9797..8dcc055ca 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 54be9bb7b..8fc76ff62 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 ddebe6bc5..5095336b7 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 2fc097a78..1d898e3c3 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 a3f0fcd54..4adc909f0 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 667821899..f59a6f0f4 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 4ef98f4d0..d3648e7db 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 d2cd5b1fd..287ca6440 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 8cf43f94e..04f3865a7 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 2c25fe7df..66f11e7b0 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 5d87e90b0..2086cba3d 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 312280e36..17f9534e3 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 02a4b4ee7..68c2b40ae 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 aa41d2905..4059c481e 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 3a87a533e..3f571b937 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 3855281fb..ae6f460cc 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 255f91701..687d02dc6 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 55ee830f7..14db149f3 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 684fffab3..4573fe56a 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 aa7eb0a40..a6a458fc3 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 9a47b0e8d..72d917140 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 6079b1619..c3238b5eb 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 440d4b027..2bfad56c4 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 867882488..2f683fd15 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 d7ae32edd..526ca8e2f 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 62f7bd18d..389bfbf7b 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 66bf699be..a4af8f3a4 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 31aa9d437..c2dab299a 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 845d8ba44..93d6d2df9 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 d1aca1ecf..3a43bed6a 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 4be9d74a7..d39c4fbaf 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 a835c15e4..77fb03c80 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 c5b5057b1..008d31d27 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 498cf3161..1d178b418 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 818184a93..4744792e7 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 0cc5eef93..5e4ec0de7 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 8c675bbd9..168baf212 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 a91a4bef6..386f0d0b1 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 93b515a1c..de1f02b58 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 a3c0ff9e5..e73bae7e3 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 31f245c73..ff4e38978 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 7f1b71fc5..4519fcb49 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 61945aef9..8072b478d 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 09fafd9df..2120f91f3 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 e616351d2..d40990c2e 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 8506affca..021714302 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 9159ba0d8..f7238568f 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 c8dc1ba56..2fd08be56 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 bb068d731..4956e5452 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 4ac580b65..631fabe7f 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 1ced3e55e..6f60a07fc 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 0b6efa9fe..4ba35c012 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 dd4095841..21bb72e68 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 3fa46e053..53d9837c7 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 2719e1aea..39f1717d1 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 fc8e4b30b..fe619ad66 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 514e42a59..2d8771b75 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 dccf95496..3f59cb432 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 f0e91f634..9fd2f841b 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 d3164f0a0..adcefb078 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 f8d580b44..a32b0742f 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 5e40014ff..3e2d4c86e 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 1c5314cd4..e3a58f8c9 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 a5e60ca31..132ba591c 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 65e644a29..2add5be11 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 93dc8189a..73cf399af 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 86d2bf7ca..c9478ca50 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 8bea1848e..7396169d1 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 33ab11070..6d7ccb6ed 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 94ac8536b..533586cab 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 e54d341ab..c2a936cd8 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 ca8a8fed5..8790d02f8 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 29b7b8fd9..d393c7b56 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 5d2771dd9..822b729dc 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 c56c6bede..542d99f97 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 5e745982d..35e5cdd08 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 83770e8bd..7bdba5d2a 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 c05decfaa..eb825d1d5 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 59760d52f..9a9833e35 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 bb71ab340..15434cff0 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 d0b567362..0693490db 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 2355cb7b4..6b9204766 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 ee638a828..9cca8aa64 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 b7fe140fe..50346de1c 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 f3244e79c..69aabc24a 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 f50328da2..d6796e59e 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 111cedb01..c39ab986a 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 3fd6056b6..bd34f32fc 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 51962fe21..1cc14181e 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 5e037f3ab..e95d2e293 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 1032f369a..e041b98f2 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 997b51ee0..83dcde5a4 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 0c059dcaf..42504c01f 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 0564b9f71..69a7ed9f8 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 c7bf28e7d..8c1d0af1f 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 a750c4d91..d305b0cd3 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 4a5964805..8d9ecb46c 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 1e0ed4db1..0ad6e9e15 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 6d938537e..0f439b529 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 6b7c34c6d..d700a692b 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 a0c80ba9d..a8f28a849 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 78b596e1f..b80cad32a 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 cab8c1e8b..9fb2b2bed 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 48b00b874..c5c635f5b 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 7ba822444..e8bba8e4c 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 e0ec61512..eb833c19c 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 54e6e7afc..d94009e7b 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 eb5b54cc9..2a28abe2b 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 b271afb2e..00e1ef4d1 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 2179bed61..8692fbb3a 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 16c11612f..b8ff15a81 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 ccfc301ec..943f84922 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 5e5c4b2f9..8ad6a0292 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 4c9a9e1cf..866af41f6 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 ea64bef9d..6c3c992e3 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 5cde05b1b..569bc7bca 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 7885f9cde..ae7e62a8e 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 ea0e2cf46..998ceee61 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 28d7b53d2..f44612503 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 4b3d21278..f342d2428 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 ef6b576fe..9edf5c621 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 aaecfaa46..fca40ea05 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 acc895f48..79a07b9d9 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 8fa61d44a..c97ed7284 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 0b70c8ce2..f05e150b7 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 93c3d8b71..28039d2d3 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 0abca8785..635f2f76e 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 4ce50ebbf..fad147574 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 600ede940..750d02429 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 1fbde210f..6eadff5b1 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 c1c03ea20..f2d3ef323 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 832bfb86c..12c7bf396 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 4269ef3b1..21cbe63ce 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 616c4200b..fc5feae17 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 65160d7c6..a1b1f2db5 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 c44ef18cf..9e0121370 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 e35f9cfc1..23ecdedc4 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 59955e6aa..c8c33eff3 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 063717b95..7bf4f1bf2 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 89c843d82..eef45ec27 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 99b046923..78495373c 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 db37319ec..5cbac06f1 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 91c82f416..9d78ff200 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 495481717..f8857fac6 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 936fce9ae..015d6841b 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 87c1f7fb2..846bcfee5 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 ea470a1c9..3ed3f885d 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 e5f2ea619..c78ad19fb 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 3dd924a32..05d331f8d 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 ffdafbfd4..c31315142 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 79a02e554..0d32ca264 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 b34c4daab..21177d7ca 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 3381d711f..93f132c59 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 054c2d7ba..46a94fa01 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 275fe3787..6240b37ba 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 902720863..6656e9829 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 c878c4905..21c575df0 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 c195cdb13..80e06e80b 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 b678b0eb5..744e25bb7 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 eddb6fd29..2d2d30c51 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 508228a28..cde9f72a5 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 ac5738aab..b5a98c784 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 b4cc9c544..015a38d44 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 4d8cf3dee..df8131492 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 22ad933e2..30cd2838d 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 c5351b387..da44ffac0 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 155e62157..da7dc8d72 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 20e787b90..ca1f6c475 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 3bdd6e8a8..055665864 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 6a7118b6f..63314e327 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 717f0f0d8..af5cf13d3 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 51300ea85..02a7afaf1 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 0ae94af11..447574c3d 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 ca0767750..8f3e42f5c 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 a4bf78c80..a9f7d635f 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 4ed2579ce..d46c8045d 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 a72d2a4c9..95e6361d6 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 e41ea0c9c..a3b841023 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 35e5cbc10..b957019d3 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 2ebfc6065..604ddc2e5 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 427fb051d..25c7e5a9f 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 bc0b033c6..8bbfc2b9a 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 73ae48965..53d81bcaa 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 a269618fb..ad4d2b077 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 c175c7b34..ff365780f 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 be3ef6cd3..a8762ab0b 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 cdc52ab8f..1b553ec45 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 8eb1da01c..ebdbabb26 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 4ebd27990..746c036f1 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 8538e3709..db36c29ec 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 2d5f57d57..24e5aeed4 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 5b6a92bd1..6a3dca9e2 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 b15de6f5e..829f1e5a7 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 6b0ad9f84..426df1891 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 88a1cb8d5..b4787ec03 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 820c94a09..a6dc9277c 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 dd07f73ea..eb35d3acf 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 01e115492..38ce17d7d 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 01bc7bdc4..8fc5f134b 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 a5432f666..cd3504b8f 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 db54258ad..2c9b91e2c 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 d2fa2a5cb..3cd82e9be 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 dc5269665..36cc2c2b9 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 7630303f1..94ce06370 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 317114d93..e8c19e1bd 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 eb6062b74..5e3561bdd 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 0331bd83c..286bcd5f2 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 49538a307..82d1c5af9 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 1a544d686..dba5b0a9e 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 aa61bea9b..30d93d0b5 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 b8f80156d..fd8af8571 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 0784a753e..1aca1e83f 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 615120de4..c71cffd15 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 9aff24a4c..d4ac568e3 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 abf61cd43..5ebd8ef1d 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 cc7c95f9b..83e3e0d22 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 3de848c33..a384265cd 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 a2b3b8bf9..23aba7d4e 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 fc677d136..bca36f42e 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 a0330bf3c..ed70ec562 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 b316989e5..82747f690 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 e73b01cae..e39994229 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 ddb309274..36ab21af9 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 959f32449..b92f51348 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 beb97b938..d97b5e56f 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 78e5fa06f..4d3e914a4 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 5edaf73e0..514254267 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 37406e9b1..ff64cfd1d 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 d46345a39..19c501fad 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 d0a1368d3..19fe34d68 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 eaa8f59d7..977cfe848 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 e9ca54a44..ec3d25c48 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 00800726b..7de116a66 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 b44be55ce..af65e8a56 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 5ec61b9f7..32f0e8c48 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 0a5e2fab4..3fcf9a65a 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 3ee1626d0..64311fc8b 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 0dd82a07b..7aecec8ae 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 1a5ce84bd..c54305b78 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 8789c6196..c7bbcf428 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 4f769d63b..123124d05 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 07f97eaed..7d5711fe2 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 2f2404938..5825ac48e 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 5d1fc5e5c..372da35a4 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 3a70ccf9f..5ee1dc624 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 0db839c2c..c5802348b 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 030c78172..a42cd344e 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 174924e5f..72d62f571 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 2163f45ad..3ae3cced4 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 2bcbbe88c..9ad0ecf0a 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 9a934de4f..ee195caa2 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 1f274c0d2..8fadedd21 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 0ee0e5e87..a80d723e2 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 f08c87fb7..5b0ae0ac0 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 92e436fe0..36d2d35de 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 557f3ccfb..f4f9e2bf0 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 19e77b911..e2902bfe9 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 73e036bb4..3e6cde0b9 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 436241b5a..3f848b9ed 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 c4f1681de..23a62512a 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 3ce9fc3fe..9a47daba0 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 e747eeaf8..8015b3c1a 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 0a258076d..597f86e29 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 738f7b406..2daeef0d5 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 865fccfe6..5b4bf7f8e 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 b5aecc8be..68f32c827 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 763587bf1..c1b0c2a49 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 4ffc451c9..0017694c4 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 8e3cf7ac3..d6e6dd053 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 d7de4033b..fb486aa75 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 6869e0c44..dcb551cb0 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 ed7ba262e..af30b69dd 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 39a7a6b66..6efbc9a81 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 c2c21b92d..9fe15c7fd 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 cfeff4eb3..022c616e0 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 c0d1830fe..d24938dfd 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 536d1f264..4eecca1c7 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 4611f5cad..107bf2833 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 5bbe7e97b..2b13e74d3 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 499800d03..0b42a57cc 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 db615f0a2..66fe5143d 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 c7906a79c..cdd9952db 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 2dac30e00..2a273f6b4 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 6d99dbc41..553bb0de3 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 6f478627e..c9443c758 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 273293e43..ac39e4247 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 85528e990..06f02248e 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 6b5e9e85c..1b3edaa5f 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 44c359b6b..0fa5cf7a7 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 06a1532cb..a10d084ba 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 15dbe1da3..b9da00bc6 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 dde316f15..44c10c9ea 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 7b16c4d72..4a1957938 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 8412320b1..104b8a8a8 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 0f4b6032d..c0105ddc1 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 c422d9e80..3432aac83 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 b8eaaf32e..4629ec3bd 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 c799cd01e..1e9e7b6d9 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 40990d04b..ab21d8181 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 c12de82fd..e125cdd5a 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 d75cb6800..e9e7d188a 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 2784e5fe3..4c52ec7f9 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 6c66829a3..ec32e5f31 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 c5e998f54..0f3b7ee97 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 6099dea8c..32b961e8e 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 67f810f69..5a40f8574 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 595f41314..4dfddf9c0 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 3ca156ad2..239597e7e 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 7ade5dfcd..0022e3176 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 7cb8c44f1..a85a31ea2 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 552915290..77fac432a 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 cc55208ca..dd4136873 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 e4657b35e..0317da32e 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 5b6e91917..25eee5bc0 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 f8b6b6eb6..ed1754539 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 fd1ea68bd..d22b201db 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 6f0c2acb7..a0fdb5c68 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 b5e378711..fd7b76c42 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 4e74f8a6e..ea5d8057a 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 88153d25c..ec10fc476 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 adf3c7e25..7bf2e1d55 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 bdebbefa6..7487c5196 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 59c3470ef..b08e09478 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 551be7ee6..de9395bdb 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 932039abe..fe88160c9 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 9e5fe479b..3bee761f9 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 c0bb62b1f..79df3afeb 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 f3082d4c4..7d1df0b04 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 eecd166a9..af835d50e 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 6c852c05a..1622e7833 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 605d836af..32ede7b23 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 b118f88a2..32afb91d8 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 18c625bbf..afca5239f 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 8aaa53e18..1b752fc6e 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 758a69eb5..abd79e02b 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 31e59f3da..0f3545819 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 b266b0761..417f06e35 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 715225990..19b22b61b 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 11cb6bf26..20ab4f26a 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 19a3c9cc3..c0d52cf84 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 d186850f9..31c9154dd 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 42e76b667..11aa303f5 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 eea7bbb7f..e40b148ad 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 c31cab6c3..8f30c6061 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 3c5fcf7f0..955b18861 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 927839129..6c2ee402f 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 0c6c68c8b..d371c6ee7 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 06f31eb51..65bda92e4 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 cce67b8e8..0ab4abd59 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 9ae2e6472..f118dd53e 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 1fa9f3906..c1a29893a 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 d9aa16f43..a8c2a585e 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 cd901b692..3961756c9 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 07e36dcd5..877277afa 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 8c071ae40..1ac54af97 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 e7cf1aee1..8b3222073 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 4fcc6acab..92366cc24 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 fc62ced36..fbc419cf7 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 a5fc1d9f4..d68ca4833 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 b83282fd0..46ad49e68 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 18e677b01..cc34a1e85 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 d9f97d4c1..0a8466bc3 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 291cfae53..134ccbd8a 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 367a587c5..114e9f09c 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 4fdb4eb5b..2e532f8a1 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 3a9ccce34..54c57856a 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 f8a5eb788..ffa0997ef 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 d27878f26..d6592f2e0 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 ef003667a..8d1c264a9 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 57b172574..2ff6f1a42 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 1a5360aba..610afbead 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 feda4d3be..3d139f028 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 2c2be60bd..1f29c4fe9 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 ab1848cc1..ab3e5ebe0 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 29deeeff5..44bbf0134 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 d619d2e0e..a954f3096 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 89f811ac3..0d67c46ca 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 430c8ce57..a14eb86b3 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 120cb46f5..a81465bac 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 b5eab1bca..fe55a07be 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 f0afa6cd2..f2e3cac54 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 0d88d2924..6b18f23a5 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 fd381961f..e3a29dac8 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 812cb25c8..ca434cd65 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 1f04866b0..68068ddec 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 7f6be2cdd..e8f12e1f3 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 592f29530..0e1dd0526 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 493651850..a02b90edb 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 23aa2f289..cc10c26ca 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 a506658ad..7baf6ba13 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 6f771aea7..6cc057c33 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 7d6bcc9b9..7c37b62ed 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 47f33de28..5831f5b21 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 063370eb5..bcc57d2e7 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 66ce82d4e..1b65f34df 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 e317a8b43..f942aa15c 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 63c941bcc..7167208c9 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 18a75e994..e6b50d84a 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 f03b6a0ae..dc55c6438 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 e85769157..eeab1433f 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 3855d84c2..521a8630f 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 80ed3f82f..294d6b89d 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 5bd9e901c..52e3eac1f 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 8b6fd355f..fe3e0d7a3 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 38a1f3158..b8fa924e2 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 671523dcb..2a20d2473 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 23319f034..977056c3f 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 f81f02bf5..574bdcf3e 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 6a9dbb9a4..a3361a5ba 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 a53e0f9fc..60d62e6cd 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 d2ca9690c..c67862937 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 42130cca6..22fa68cfc 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 cff9ff017..473518092 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 17129f08e..763681b09 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 fbafa0649..daaaef694 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 ca9cd06ac..a0cdf65d8 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 4c5cb7119..007121c97 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 de50d2dce..b13db54db 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 d49ae0606..41e623460 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 259c7d5b1..263c66a6e 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 aeb8999d6..272d32ced 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 640b8ea2e..47dd34cc6 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 fde5f805c..55c767fcc 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 a0514a184..2bc372d5b 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 2a25a49fc..06f73760d 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 d526aa7f7..50254a58d 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 e9bd4e685..1228e7271 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 4094d5cde..61878579c 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 9722d8a9a..a7839d408 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 674a4f285..32badd925 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 93ba21b1a..c29309a29 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 7d88a5013..a7352f138 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 6349a187b..2b30a8778 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 2e8518126..9d36f0a1c 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 532adc655..9c21b7cf7 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 e25206965..63bfd3b35 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 e3ac0b208..eb0662247 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 3e7a3e005..58e93548a 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 ff3873035..2845c9571 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 e1e43d17d..ae1803c44 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 08d719d09..ab883be61 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 56a50c6ac..83207e8f6 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 ff9409730..290fe0ec8 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 c54c2e459..b6dc6bf23 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 2bf935205..2d54c7ea6 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 ecc0c81a7..4c7d8fc88 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 d3d6127f0..f2fb4a224 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 733308f0d..618b2ac27 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 c589ca062..8b70860a0 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 894a8d238..159de219b 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 90dda9c87..24a69e0d9 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 f3c5e4cca..2ec9fca06 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 576c3a2b1..9f72d27ac 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 e68d581d3..219d58ba6 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 f7f19dd18..382ffec1a 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 d2f07b71f..6f758bfd2 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 8709ec890..fc528f127 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 740363584..655751516 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 72b0afdac..6db499e40 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 e042d1264..2a4bd38ee 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 4b3778be0..1de773f5d 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 5b9be2cef..05d738e87 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 a839f0ae2..790806ecd 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 ec12b65a5..c920292d9 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 535d59c50..6b0eed5eb 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 08ebb1036..e0a78ad2c 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 f9d972542..904a080a1 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 48cc3f209..1d28f464f 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 3752e4d44..c1fdce566 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 deeeb2ceb..fde0ffaca 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 faba3d05c..cff1500dd 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 4a4ee8616..cd8e207b3 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 089c3d883..4248dc1b5 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 7cc56efca..f62bd3b14 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 8f8d8865f..7216ab2dc 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 33d1306f2..a3fca95e2 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 544ef3a94..40485719b 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 c9aa7a219..2489da97a 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 4c646182d..50889861d 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 e098c7d59..381b9d69c 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 46c0512fc..f9a52b790 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 891153a0d..bb819ad2a 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 6e05b6159..5a4a87d2d 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 ba137ce67..b988c0ce3 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 18fc8211b..cd13d47be 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 5c45c43a4..ef1cf2657 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 339526827..150f55f18 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 1cd1629ca..3cab821db 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 de6711b03..4dda44d9f 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 48cf08043..f3d165336 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 bad847c43..bdd4774e2 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 ec8762eec..034e0edcf 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 45d9b2b7b..c23691387 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 f09d31065..cd9f7fed9 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 1907ad7c5..1112daeb5 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 790750341..5b056bce2 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 aa053db87..edca94bf7 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 f92fe724e..f93273d49 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 11896c239..b401d021e 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 52cdadeb1..a2ee04db8 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 26bc733cf..74837f0a9 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 c27466e5f..5feed0af8 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 4136be6bb..c883e3959 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 9fed13039..ca8172dc3 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 a84d76c94..9654f4d54 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 2017c7d6e..dd27d832d 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 34a40611b..4f2b75c9d 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 e47f078d4..9ca3d7105 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 6486de470..1b3255dfe 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 375badf63..f49657980 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 a3ee2be75..724b67b5b 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 08771226f..6bc1ea899 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 f3473ed5e..0105b1939 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 e369f4a0d..2d6ffe588 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 ef4b4cc09..94d07e57e 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 a967f388b..8157f1c87 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 2a8c014c7..6280d70cb 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 f20c52ffd..ee2a1319c 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 02a702430..bf81be977 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 f462bbf58..3028f260c 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 7c1549774..e7e734a74 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 800afeacd..395a61093 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 8b6714f62..738589f49 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 1da4e4dbf..0a8c7947e 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 894f76a6e..ed7830871 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 345659f1e..094524e62 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 7c15ffa07..528190ceb 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 ec11bbd51..56763e584 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 5f67f0dfa..771c2d2fc 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 07d57142d..18a03804b 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 8a3260999..268fa7e89 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 1b95b543f..945041dfb 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 7b9c3d354..1281819ad 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 a402f8942..c180b0ec9 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 312adbaa0..9fe2eec28 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 ec9bd68aa..08a215efa 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 91f127c58..ed1bcdfe5 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 399a44ff6..88b70f9fd 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 662a51024..51526fd0a 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 3b7a14052..c5c7f1af5 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 414e6155f..e2445f317 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 8105257cd..7e6db5383 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 a196a57cd..eec586068 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 76b37aab9..e29c8b14f 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 3972e2504..89cd2b876 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 2d4746d7b..af2dae030 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 f00b50c82..4582b459a 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 1d1d19729..52e6f706d 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 3af26c857..546eebcf7 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 c82fcf505..b7153b9bc 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 f57f44fcf..ca68cce9d 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 92361bfe7..4eb879d7a 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 3a5559232..7b82ea8b0 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 f2a8e72f3..841929b2e 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 9a485133a..8e6aa61a5 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 025dc11ca..0c09f1635 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 8124bf803..73654e926 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 0da152723..ef369a2e4 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 94b1006c7..74134d8e0 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 a74cdfd0e..0290ec5c8 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 a05b29858..7ce8ef19c 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 630d56cde..6547908ee 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 d845c2d17..2f1119888 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 bf2813969..1cb921c84 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 a67daddeb..a885f3343 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 0dffd4f80..75a23a0b5 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 d2fdf37c1..269f9bd6a 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 de0f97c7a..586af9e0e 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 0b0eb8161..e18fa2fd5 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 92e664d04..8a203a6a3 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 d2a4b59e4..44c677a90 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 8389798d5..0cca43083 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 28362ad3c..dcba210c4 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 963ea0648..a06b7d6d8 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 1815d7b37..5fec699c2 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 617f45ca7..73694e7bc 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 f1080be62..277f18215 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 23a891a13..12f18f890 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 b9eac63af..f72cfe6f5 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 5bb7cce1b..1af0d6e25 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 a40b5e923..d36a04e96 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 38ef9cf5f..3507e1281 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 c45178290..ae163109c 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 3739ec2fa..d7dea236e 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 f8d79dd4b..163f9609b 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 cd0261164..32ac048ed 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 10587ad14..d25339773 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 59bfb2b3c..54d6c2148 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 a0ca00544..6a90f850b 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 e55f527fa..64e9c3c4e 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 afdae5613..200032193 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 dfef212e2..451ce15df 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 61b4363c4..63f5deeeb 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 c6f0c538f..0bc9f05da 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 8635c31af..b81514d03 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 0c65c3fa4..7eee2b1eb 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 1a0bc8709..ae7e77e01 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 f79ecdcc2..15b1c0ccb 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 938ed057e..640b390c6 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 e6d71b822..f2cb41881 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 a6d74a8a7..9f0e90691 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 d82ec922f..bb2f0fe8a 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 a67782f1c..4055e6692 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 e8ab52fc7..d97c0a15e 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 0ef9d880c..23037ee84 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 1d64bb947..d39892245 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 ba66ab771..879a4d31a 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 2ffce95ef..c611b00f0 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 dc42cb753..3dca690f6 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 882dfa822..68a5f0923 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 510b2ea18..d19d28c27 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 51f466279..1aa28cfdd 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 1fe891935..630f276c8 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 7159b38b2..abbeedfeb 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 8db874ded..7d4e2a74a 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 7bb3bd22e..1d48bf484 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 549a9cb7b..e5a8a0d8b 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 521774b03..ec0a1b109 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 5c08705f0..9013c3e91 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 f6823ddb7..e7e88abae 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 990b9d900..86ceb1f46 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 7f5903849..9c8347cd4 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 88c75626d..02885ea91 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 7fca1dcf7..27f5a78af 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 073faf6e8..1cb77f2d5 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 b7ba37dfe..039bf2c45 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 eb2b10198..1df741f2b 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 a2228df93..6511bf3e6 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 9f510ba8b..182c39680 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 45e792c51..1bd3dfe4f 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 52d6d7d30..f7540c2da 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 e459f80c0..467255db6 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 56101e949..426fe29e3 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 7b40fa359..624b074c4 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 f4375cbc8..e3a34cb9b 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 cba6c24f4..1a0def153 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 8220e7556..bc9252019 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 276a52abc..bdaabfa7f 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 2e0ed046f..e06cef006 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 652078029..4eab17c04 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 1f4f675dc..20aa7944a 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 628f57c8f..04ba36aea 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 981f5394b..38358115e 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 cbc6b3515..4531e2ed5 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 36a560d6e..c6ecca1c2 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 00c20fd38..527cf64cf 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 fca19fa8c..9160709e8 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 093f4cab8..9050d90e8 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 6cb518841..5b0b6e777 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 e296d011a..d732a1a3a 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 feadc2705..92d9fd442 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 7d1bfbea2..f0662e2ec 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 57246988b..ba5a9d3c9 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 42f00eb18..ac7277dbe 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 fc8746359..8b2a90bf6 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 9015e161c..3636ce4b0 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 ae28cd689..65b22eb23 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 4d086d0ea..e10caf140 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 1997275f9..ea6e6c45b 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 5ae3b981e..ce868aff5 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 8bb6ec6ae..1272cbd79 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 0009d0584..6991883e7 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 5f44de3b7..7e05c61bb 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 cd709fb56..02296a41d 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 f43506c76..8f9d37cdd 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 3d86637ae..b539f5631 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 bb47cbea7..3e70a202c 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 0b0a0e25f..ea25105f1 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 af738e273..b2373279f 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 bfa90ef80..edfb1137a 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 8c9b3d9aa..4c5b78a10 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 9300b7bd9..6b83ab260 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 54e4d277f..e79c59b3b 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 b6f854744..8f3abbde7 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 f3ef85b96..f4a112ec9 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 ced380a6d..88a5b1f70 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 d22314502..2e33bca60 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 be9a0c5f7..517072227 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 f83e13c38..33bc95828 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 33542f2a4..9708508b6 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 714ecbc98..411b974bf 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 2372e81a7..23034b200 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 63b8e27a7..6a3ad4395 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 68cc693be..42c23484e 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 de262ef31..99433d91a 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 c676932b8..d271f440a 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 d4fce7f69..667ff2a41 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 4164cb620..457231b62 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 e5deaf5ff..76de905b1 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 b7ac0845c..5d7746379 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 437b907db..27e728b42 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 022902348..97427f508 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 d81eae905..a578392d9 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 c7c55cdcb..52406a9ae 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 fd8665967..4d5a29f4e 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 c237bbea2..a0f54b821 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 ff6870ea9..380139c44 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 33c1e7801..b2ddb1df4 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 fdf7be0dc..50894a811 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 3bda5fe2e..2a9ed1a1e 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 f94ae810b..85095e69b 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 05e207438..5d1445485 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 38be5c8ad..007111694 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 a4ebf527c..7552cae3a 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 7c2896785..cec23474e 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 22d65d741..51121a0a5 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 d50bd4269..ae20e7a4f 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 0cf28878d..e84287562 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 28720b286..02413159b 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 79c2de073..2520115b6 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 5a7dd07e4..342e68006 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 20b1390dd..ba59b9364 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 9d1058ab3..d1335f01e 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 f4d8ce189..78a9079f1 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 5e5189e15..3e28c3c13 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 23b4e7318..46b8d6560 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 aa0e10191..3c853cdb1 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 bfc7d5aeb..15a4804c3 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 237bc4d72..c204fa798 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 d065f5659..0f6a131e5 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 e5f1e408b..54a25d3aa 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 236514a26..46f430803 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 a277bfb8c..f21fe85ed 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 8a5ab6c03..33ec10642 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 7489f7ab9..33db9354b 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 e63f73c07..a8ec75e40 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 e4ce92eae..af9b4670e 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 70a1660a3..8206042bc 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 9e5e08530..436a010ef 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 933891d6a..fb2b5f191 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 d5954789e..821d6fe75 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 bbcce2cb5..1723590d2 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 8cc2bd12f..9db904ae3 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 a099d1f46..fdba1540c 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 f6cbfe04a..4acb83538 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 cffa793d9..9e5818f57 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 92ec359c0..45712531e 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 1cd030a3b..b7bc704d4 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 801bd6c87..b4774c962 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 301749d15..b5578ee06 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 6eda0b9f6..10442c08d 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 803965153..78fa532ac 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 e5ca4f52c..84abc5621 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 383519ee7..1f3c6a2a7 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 9d7a070f3..81660efb5 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 1e2fe786c..1be35e770 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 91cb5a813..f4922af97 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 bc4c8a308..2ee0d48be 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 412cdac35..b21581321 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 8355699ff..11d7d18ed 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 658c9cfe1..8b628e486 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 7c9497fef..b13f90538 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 e9e0f1dbb..d93c3e9ad 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 1e913e3a0..0d4d23467 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 89341a4c7..2b5ac4f45 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 8eb498ee3..820efba0b 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 f3103d832..eb0fd1b39 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 025da122d..19ee970a2 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 aaf06d53d..2c285b484 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 97bd1a2f1..0d8371863 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 6535ba948..7cd33292b 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 bdabc05b1..234bc5f76 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 ef94c4704..3f3ca8c2f 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 f97705cd7..569a05430 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 2967c72ac..0dce48d59 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 61df576b2..eedcf26b9 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 81f2bd633..dfd65e766 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 134c8093a..c6e88c733 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 f5dd8bc35..ffa10bd58 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 1a1ea52e4..33568171b 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 ce5fcfada..88c31c2f8 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 88f1e3626..c2e5cd352 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 782d6d3d4..13d35eff3 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 6e178b2c6..4522d2f07 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 5df8d64f7..873844c1e 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 e54bede8e..5fceaa216 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 dd0c94d34..6c009174e 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 09314d048..8ad03ae78 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 e37208f31..3b3adf299 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 da222bc14..5f7a3a0af 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 a8649ccd7..f68f84238 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 bca7c006a..2801c9f62 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 db3c7f0b9..5901ccc97 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 cbcd4c92c..ffb64993d 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 10d84e936..6f4d2067f 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 69c088664..1b375aa0a 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 10cfa1ac9..8e5147126 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 a5d669676..54b0d16af 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 60b770eed..a71a1f4db 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 05ad13425..7e16345aa 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 26f6a4146..e584a9996 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 711ebf76a..f5b82a73a 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 7795c2748..24ea68a85 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 29b2d40b7..968629d2e 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 cf4d24be4..30b13e939 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 b8f9a31ed..613286966 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 79aeea84d..aa02c6576 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 c37744c9d..a41ff3d08 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 b0309935c..7c8ba78a2 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 0ad44ab37..8bafdfced 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 729033f8c..131ba665a 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 e8e4cc690..0de3100ff 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 3691ec79c..367d30fcf 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 daaad4496..c6e5ef884 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 3b4e55f94..df7b5b6de 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 2ffb692c1..fccf5bd2c 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 fefe79cfd..2d05d6314 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 5f6ef5c69..3b7c25fed 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 7d823f779..d13be0e9c 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 221d15758..457fd628b 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 62530b00e..73137269c 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 ea85211e8..326801b1f 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 9194b88b8..e04d728bc 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 5c6c05ea6..15441eaa4 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 1aa691950..8f305b6e6 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 406265839..d224045e7 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 5fad7d787..9ee209d3a 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 94d55b01d..e51f4309d 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 7337f6e44..97c7fa7e9 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 75e94b2bb..9d1a201fb 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 398cffdbe..13b018233 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 f0b3f48df..1036b7d09 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 babf6b34f..f6743a405 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 4ae52ea96..6fd504878 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 22bd07b39..5d07b1e01 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 6172d2709..a68141990 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 46fe8e665..e97591b34 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 24eee43c0..616b74f11 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 e90c730ae..9c9ced2ac 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 106fabb66..896e701f0 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 0a1c1c22a..19bd60776 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 d9c80a9c3..594c8b7b8 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 201ed44d8..8e5103a0c 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 6d0e07ef9..a5a1dfc06 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 fd4fe03c6..75bac480f 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 f611840e3..c6177f93e 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 908605d7c..c145020b7 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 ba5dc12d5..3ac1969d9 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 b9abd5f82..b0c73acb3 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 51bd353d0..ddf410e21 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 7ece8b1b4..7ea747e42 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 2b1ee78d3..d213c6420 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 95f7c12c8..bbe3de4be 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 497871a07..fc57513ba 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 67b0ca305..9fff9363e 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 fd960f0fa..b94f06cb9 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 f01f5a8c2..e6fb016f7 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 7c823e737..bd6773ba9 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 53966403e..991a1eec8 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 2adccd4a9..711ca2bdc 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 e6970524f..f25df7a99 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 481493606..374d4c452 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 cad859471..3d0b7f320 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 537c1b0ce..839d65842 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 a156525e5..3f06b1905 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 3c92535d9..e3fb2c1e1 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 b6df3d700..07531a47e 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 0d30a026c..8fac395b7 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 f035a60af..82c02286c 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 3f638c2ea..03205e410 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 68ead6e29..f6d347ac9 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 4a657b244..f85cda0cb 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 d0d7cccb7..be74bda00 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 0c0fafda8..139db8252 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 a11009a37..b96f73ca5 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 5f226ba73..7c96d1ef5 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 bf52f4e20..b837f8c2c 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 ff2d91382..4b6e96c8f 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 aea170659..e5ca470a1 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 85718b403..fb4ee281d 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 a1b42491d..5d5b0e69d 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 d6fcea6bc..324fe695e 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 3960f48be..e98f6663c 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 44c6c825d..96024b69f 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 045357699..9c46159d8 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 12cbf5bab..b22fbb823 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 f4759b46d..5b89771ae 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 18ada68da..da7e78a36 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 dbcc850c3..af07f0a1d 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 4e9cf6533..d225ef735 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 80a0dfbff..d82316a11 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 a7bbf35b4..5288bb22e 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 1f35b74c8..233b5c10a 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 d8681859e..a05f2344e 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 880606291..13e494d94 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 9169e997d..07937926e 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 6f9fb6e55..50723fc3d 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 e58ba975d..8f5243552 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 fb4a2df3b..0acfb4bcf 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 f15073301..6ac46b2a1 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 852b08aa9..3f6db0f62 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 5870d1679..f045dec64 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 5d19f24bd..139e0dd40 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 f6d3b549b..7524e5292 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 b292aea2d..602e48f09 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 03cb54261..ebae7d8c6 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 a07a52874..e9daa560d 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 2c2d6d787..b76ca68e3 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 e740949a9..25d9d4cf9 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 eae58b546..484509e77 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 a8fcfaa7a..1bd4a962a 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 7b0b16f28..d1f52c4aa 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 6b7919c5a..124eb0f5b 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 2950a8e42..e38151f84 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 7940b7d93..319d7db6a 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 f3a0a51e1..095bb368e 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 ae4215aaa..0401ffbad 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 7e400831e..bb72f71c0 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 49005e491..e6c648cb6 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 c9d589750..00b1dc1ea 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 caeebf656..3fd5b4079 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 0f1987158..f3d1666e9 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 2f4dad0e1..42a250c45 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 f94bcf2dc..c2f50125d 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 c7ea3c200..7b1c25391 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 4c971f1e0..f9980ed7e 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 2983577eb..6194f8fff 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 04984e966..d1e2002c5 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 ed6558505..6a1baad7a 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 106346b88..51fdd1eb1 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 774c6749e..e263523d4 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 66cf7338f..2974ef103 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 3e8c8bb79..73513cc87 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 5396525e2..713b2cea4 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 62da745f8..599fdf2ff 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 2a5322d82..4034c3802 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 799953cb8..49767ab1c 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 d842f6e70..96fa56a3b 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 e1952ab0f..6cb8fceb4 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 e088958ac..254238c2b 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 eed4e7e53..07c409482 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 92d51bde2..21315f9dd 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 ba4d99a75..d8d116658 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 aea68a706..e76624b62 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 3c784f8c4..092ff247d 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 6d49859d2..dbe13b603 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 a32bb6d3f..a552c7318 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 6611feda4..d9a602d86 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 092e15956..7336c458d 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 45ee94245..715266df5 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 65b335809..728297241 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 a8a027d82..8c6fa983a 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 3acf9a30f..7750fe6d8 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 02b5c978b..fa9c6e13b 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 6fff924cc..415b33774 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 0715b2ee4..25a467f20 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 405153350..0e571b729 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 02cd8929f..3e14638b9 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 38c917deb..399ae28e3 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 8d985beb0..d2331c2e1 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 bcdc39bc8..205e701ad 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 c1d7dfe15..602d54b4f 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 da5ca71be..6fc81be0e 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 31342c002..745ab0b10 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 15f20e71b..1da8c5171 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 43cf7cfaf..eb60bb6aa 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 a522ba11b..f8ce8bab2 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 167e57843..55ffe95c7 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 3d51efa03..1ccdd6226 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 9d0f6c972..43e82a3f4 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 3c3a0a9b3..276001cf8 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 796dd73a0..6de86c38a 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 77e6f5532..ac130235c 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 899d7afe3..f8e8523e4 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 b0cf65058..545db3d7a 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 93645ff85..362b553f6 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 bbb768546..d4b4c556c 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 6fab8ec69..bf847f456 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 987349a43..064ef890f 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 df64e2b84..ebb19b81f 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 0fee9d375..c0a35d9a4 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 8f1516928..185b88659 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 5519c3bf8..b7ee2569e 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 d9d4027df..bcf5d759f 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 f833f58dc..4ed9c57ed 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 d14280376..29e831691 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 433ed4b2b..7ef640fcf 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 21b36aac6..8c5c9936d 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 fc6ed02a9..4a25c6ae6 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 b93ad165f..2a0db03bc 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 4cf1de6eb..0e65f9755 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 01da666be..666ec1cb6 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 501633d2d..e35b24406 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 077302e98..1a36a22f9 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 a04f6486c..e5b7ae728 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 1bfc56372..3f24d5fdc 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 6726fc862..9a0ca3688 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 1bee8c1df..608c7f637 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 152a24b09..6a72ee06f 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 369e42e92..f2cbb2b1d 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 b6b4f25f1..b238df771 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 0b35c9f71..25d4d79b2 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 f40eba358..2c489f819 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 2c94feb19..e82b28e4b 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 9bd98da72..c7c63f1a7 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 52772c658..b4591bf44 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 4ae161f0c..daf1075c6 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 1b80b0f54..aceaa19c2 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 4e3b59e23..4b08fffa3 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 e6ec14dfd..b0f3c97dd 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 9b8870193..91742978d 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 77ff3db29..3e4aa1637 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 33d86e373..3a717d4e8 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 9cc5a4efc..4ae94c076 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 2d4ea77ad..6f1a5ad71 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 1afce66dc..2452ca012 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 a64e063ee..1d7697ef8 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 e9ad6f8a1..ba6e0dcc0 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 d100421c5..967edc694 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 bf496ce58..fb045cdc7 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 8194dc7bd..fba89e5c1 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 66a0c2012..5e9c3c25e 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 c87784c3c..da14fcb89 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 0bbdd5809..339962845 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 156bdc4d0..dbc558b09 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 3bec0ef05..4539945bc 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 80e97ee7c..de8851f8d 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 035a4f6a4..12f169abb 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 f39091eef..e013d73d1 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 8c4878570..9a699527c 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 9b630a52f..f974b2c29 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 28f438c02..88d8defd3 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 47d90ac19..5bac8956f 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 013c8c368..acd1b8d84 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 8897ec510..6e763b93f 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 6de7165af..5d40fb403 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 dd8610025..2546ab81e 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 e27a29f75..ec074795a 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 c8f75dfc9..24c0b910d 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 fc55845b2..e13bdf8b1 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 10b31ce0d..5b9bd9b44 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 46e7f9180..0c0b76ed8 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 36384a5be..ebfaa5dce 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 daa48cc70..ea8033886 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 be2b7190e..9068ebd6b 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 da3d2c529..2a5ef7ff8 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 c065967d5..240da8be9 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 18b4d8e8e..4a7ae1323 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 b0f238f31..90088eab9 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 b3a17147c..17a19382b 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 16c55e7a6..9e83b91e7 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 20a96ef32..48977fa39 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 daea6cb5e..668a77555 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 2b14f17d9..3b6547115 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 6547ed789..207e2e718 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 cfa52c627..3b3f8462c 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 0eb77a813..ff49258d8 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 bd8d6db7c..af916ff58 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 d74584d30..31b19bdbc 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 50620517f..ace96e5ef 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 d6ab4fc46..4e68c5dd5 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 ba8f94d2f..1c4033257 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 34aa14caa..8c6a226b1 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 d9fe95602..7d7703313 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 8c3419540..901e93d23 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 79a96d59f..2694eaa6c 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 3a8f2ab80..88189ac8a 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 da461addd..c9b3687e2 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 ab91375d6..6036bf44f 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 6702d4608..48797a516 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 51d4cd825..aa161010b 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 4a73c480e..6ba08ffff 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 b5bf0ed1e..1dad7902e 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 00fd8fe4e..f0eca84d8 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 b7d5e4f43..e8a0f431a 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 b31028076..6f0933602 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 e7e472622..8519ccfb8 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 f271a7d42..252c53a0d 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 f961a569f..46a39c052 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 52054372a..ceb9e7910 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 bb0ea321e..51d228103 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 7ab067d8d..2cf981fb4 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 061e79b68..9e353373a 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 4ceaa0f76..c04284772 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 62e51cb5a..981d36b93 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 2ca7e4b49..c4090ce3e 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 9da75a902..59c90e802 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 3791cf072..211180eb6 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 68664cb3f..b63644467 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 774848f9c..38c1d295a 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 721698353..ff21af697 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 c3b59265f..927c0deaa 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 3efcd4fa4..fe2cd88ae 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 77476db9b..014d46f00 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 4d8005e6d..f7ea3e2dd 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 5dc68f41a..e2370a95d 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 c0689192e..6e1d40af6 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 df67c42b5..7928d70ab 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 ac863e40d..5a7738d25 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 7849560a5..b34f33f0e 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 a513b2c0b..d1795199c 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 ff937bbac..a5ecff60f 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 c3aec0f7a..b4e28c740 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 7f868bec1..75723a8f4 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 936171a8c..0cf93bfcd 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 8acb588e7..e81fb0fda 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 e95edef32..fa7e89c36 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 f6359d611..cbcbc0191 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 ba4e87be9..3c50177c6 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 874fc4652..87bd050dd 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 cf3fa1eb2..cf0315e12 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 36b5c98c4..cc411eefa 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 56aeae4cc..8d231806f 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 abca22e06..d00eb9491 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 8ee076990..d4c2b1d74 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 acb2fdbf4..abdd5a7c8 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 4f5c49cf8..db500024a 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 487c2723b..2d6d49f27 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 30764eb8b..d459c1e37 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 04ddbb10d..00f962e5f 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 63173c803..5d659e9d1 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 d9382cb6b..d8ae06af6 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 82c39fd32..e88686135 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 fa27ee453..9cf25d922 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 d615d3917..3446d32a7 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 fe0bfae6a..104325f60 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 0cff113df..48c05b768 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 c9bd611bb..925e5fdb2 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 26f03df79..8e1a728f8 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 a6e6e3099..d1af765e8 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 c4afe29a6..3d6d19bda 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 7aba7203b..5802dc8cc 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 abeca09c0..9170f6c5b 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 ec020ed65..3ff57ef87 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 58f134260..edf8f7aaa 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 f95451092..d2c3cf31d 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 46adf650c..feb3a3403 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 bad8f6d25..82dcfa8df 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 62e0aa033..f788ff6a8 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 7cbad32f2..669dde07d 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 e467298ad..96f06a71f 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 3255ff411..77d875f1b 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 99f2610c1..72d6748a5 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 d0754611c..ddf88b37b 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 4cd6f6049..d516743f7 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 774adf994..2e386bb87 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 06671fc17..1c9504134 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 7ab5f1408..f018612fd 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 0d4394541..cfd539076 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 eb912f22f..ca03ca486 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 14a5980b2..5dc9f1978 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 4bb165da1..13cb5b1f4 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 59d09c670..8b00f67fc 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 eaf2468e3..3871cdc80 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 dde227738..0f37ced9d 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 b8f14914e..3d1fda768 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 b11c6a15a..bd1875cf0 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 f9f8d8360..a029eadb9 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 6e18056b6..d1e6fa5d6 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 60daaef08..98325dc6e 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 b718bcc18..9700ea6f5 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 5695914eb..479113adb 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 df26c7892..c5371f5be 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 915444892..195e7873b 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 320092c2b..cf8dbc7af 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 c5673367f..8f26c8001 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 9cd102f0f..ae2908b72 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 dd13fb4cd..d6d69e1ad 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 73287aafe..fd8e1ca2b 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 d56300a5a..cf9e3a68d 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 fcd3ec374..9b4ff3acc 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 3679020f6..19750a601 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 af854b7eb..9b083f700 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 4aa79d125..12341a233 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 5a78bd531..0d4001780 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 386bdb399..57667ed5c 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 db7197cfd..7f43c59b8 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 ee9b53798..e952f8c18 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 b2195b4e1..df9659a30 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 797bda5f9..1e55d1167 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 381a892cd..1530af0d2 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 f89a3875d..331a24e29 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 8f20951f9..07f3fee11 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 6ccf45281..512f341ea 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 ad68b3076..efd922218 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 9dcbcf34d..9b82880ea 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 7ed581080..336c602c8 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 b0ace0542..e733b687d 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 1e3dcb72e..d1e869f40 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 e76465c8d..45b2caf00 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 b91b0c75c..a35f9ebb9 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 e25ef28cb..b1bdb5b8d 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 eaeb64a9d..081dfb881 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 884bedd70..3301d8ff9 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 093338c49..e1be18419 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 10e894250..a295e234a 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 6fbc33a4f..9c74646ce 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 321ba4b73..37692686d 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 26d71bc2d..84eee6716 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 0f6fc5a8d..962103214 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 09247d21b..b48a7077d 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 6f735f357..c7a513dcc 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 2691a3d0f..d630f8dfb 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 cbddd25b0..3a688aca0 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 fc014d055..2cafb4229 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 525b3bbbf..a0a66b700 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 ff1a3436b..c341524b1 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 c0ec8c3c2..4e5d504e8 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 d52b9f356..8299450f7 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 9dd3fa804..8d6a1ae09 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 5e4e2c2e5..454e2ee10 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 048bdfdb1..f89fe2e01 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 0d281d9ca..17e7558ad 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 a918f0e21..2a93efaaa 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 697c27ace..1e2b1924c 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 5470880a3..39a1abf30 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 48d7bbe8b..2438ae3f8 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 35e81d142..38ca93eb1 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 7abeaf47b..bdcb6fc82 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 fdd0f9c1c..8fc6b1202 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 d7898b316..06c40566c 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 aef731b3e..64c70057a 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 7cf624f6a..ec2028301 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 c0081a48b..f1d4285d2 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 42fd49e25..50b2c5a0e 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 86d7a58ab..da6a52de8 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 c5429537f..167865b26 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 2d9aecdd3..8337daf86 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 58f1883bd..2cde2fed8 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 ef91308af..ea9564db8 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 98cf349d2..20e842fad 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 a221dc245..0c5be9186 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 fa104a423..f5d7d3cea 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 2f8275733..1efab1bc2 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 7e04193cc..407ff8c2b 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 934a62dec..560660dc0 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 13000e192..1a7011f25 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 453049106..57dbca342 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 22da15ff6..5f813bd9e 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 412f3e19c..719b700e0 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 b5b6b7c97..0d2334c3b 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 1ce44dcd7..2f5ce8de7 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 6b49905c5..af42c6c11 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 e8b5d79a1..954baa4a5 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 aa6a1e9f1..5b923bd2d 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 15d995899..9a363b6c6 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 d68f02d9e..eb687f492 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 7ba028b18..54756d55f 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 aaf8dda59..5876744ab 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 f3f31364d..ddbe53b8c 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 b4a8284e3..a083e3ead 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 bef7d4097..a2c726f41 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 963de8d4b..45f0d8faa 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 ae0b4713e..a6497cfb7 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 a5fd2a6af..7f8b80a93 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 7f18eae9a..1835e8ad4 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 8a8b662cb..0576b9f45 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 4948945ac..c80fe4b60 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 d6a6ce01e..4a36372a4 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 b2fcab9cb..f4e656121 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 f17bbf66e..a2a50c1ab 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 6d3d75539..5b6427fec 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 78218f8e6..1cc7dca39 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 1b45d0680..8540dd9f3 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 d8aeb3ed5..7f6008ef9 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 d2fbbed56..087268834 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 f85d697b5..ff78cff6d 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 997efbb08..ed45444fe 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 de0c48905..38dfc80d6 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 16c697e51..7da0672ee 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 3262dea80..702fef079 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 9aa2b2a96..a94587501 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 c6621c4ee..011dc936d 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 db537e749..d74505c56 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 78661a7a6..34adca844 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 6d3483228..13bd45665 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 23dec11ba..5c4b824e2 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 31bcbf315..80264b971 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 b1f292060..7f1dccc22 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 580a79ee7..30593d1a9 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 664aa584a..2ea03e7b0 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 c4a613131..3a81f50c0 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 f5537b753..9fde5bcb1 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 cda8b6021..4577a5396 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 a222eb77f..e091a099a 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 f43813060..a8a8e193f 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 22e1f93ab..5ac72e79e 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 6d07c9c31..6b38ada6d 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 6eb62167a..afa5f8b30 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 f846ec9aa..a56f897c2 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 e44d29547..5496d7b0f 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 6336f44ac..f0ae0f4ed 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 7c99a3396..ce879fca8 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 c65c21511..4c4228570 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 9e2bc8109..95d1c9881 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 ce815fe9c..8581b7e44 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 f41911177..b7901d1b7 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 c75ddce8e..424a8ab46 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 2471f93bc..94696fbad 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 0e9aa5779..11a988e2b 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 db9882f93..5f9a1fe26 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 717b90558..672286803 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 ec2db78a9..2d8c51095 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 f80b82906..4f5283810 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 a874132d9..faee80de7 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 9d541a058..c0c1b2585 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 676652e67..ae9a5fa74 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 fdeb4619f..243384721 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 08804e2b2..8246215ad 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 0a760c21e..93eed51f3 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 5ba0e5345..5fb1bce20 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 e6e7c6bee..efd3ff91e 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 c719b78ab..d4f3e8b7d 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 64306912b..83d09aae9 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 9a76ef8b9..a2e639050 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 48e505cf8..2d77d5a15 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 7ce815204..9e384c7c5 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 6c692ce0f..6a525c16a 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 7051842b2..cec26be06 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 4e6d9b053..62e4b928b 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 6c13e05cb..a528f2c36 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 b95e17ae5..da4ebdfee 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 f47ca69aa..c9089c6a1 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 a015b7dfa..f064d767d 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 f10cd415c..5614b6d8d 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 318aaa2c2..0036c270a 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 fbd6a5333..13a824805 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 25d5c4ccf..1549330e6 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 fdb6e7d27..6560e66e9 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 09d996be2..8dd181e45 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 5fd74a77d..9487b6219 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 4221ba8c8..fa20deba3 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 473237f29..ac68d158d 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 68b4baf4e..377c649f3 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 41ddbba00..41b954f1c 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 3e25e0ea2..c1c10763e 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 8f04a6971..92a4003ac 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 3c6cff1d8..aade7509a 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 3e58f608e..db8278816 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 99786f9db..d8326ba73 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 b59945941..1d259a52c 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 31ad7a518..b497d9c38 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 89e788ba5..608f12b94 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 07631618f..ab2d82a2e 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 cc39d1219..239a22623 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 f5a0bb751..27f27934e 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 41d98838d..e0d4bab5f 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 ca743a35d..fe99ffe7b 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 cc921f5f5..a41da0129 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 62a85c7e6..6da4dfe03 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 5c396f8b0..2941cd508 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 8cb34b781..a0dc62cf7 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 027e0dc54..9773d081e 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 dc0b03de7..73db5ec51 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 43d2d6733..2f633a2c5 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 72a15a841..9828c7fc4 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 3835d6849..700ecbc5e 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 e4c9ae526..8301b2f28 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 1cbda36d5..13e8a64ae 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 0916c0978..30d74541a 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 f342b5e55..cd9ab7e71 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 58ccf8511..1d763f327 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 c0fa95086..1db69f841 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 7832205b0..3ae62b39c 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 eb892ee89..2aeb2d20d 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 6a24f4f8f..ee399eaff 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 7777b3adb..ddf30892f 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 9a5f0629f..93b9db935 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 6613e722c..371b0c134 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 6d50b6f1a..2a5815df0 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 aab35d542..324221f78 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 68ecd3657..ed4d701b4 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 f9a245d1d..b39f174de 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 3ba23bec4..2872465c2 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 40bcd69b0..e9dd53cbc 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 b62610384..2884043a2 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 545f4ba85..ed675cf01 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 94569c8c5..21b7a57ed 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 8cbad974a..7ffce0a69 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 6a71ae5c1..d67c0ccc6 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 92a74ada9..64ec42b08 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 8185d23b7..f98805694 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 3b48ef349..92d87b37a 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 a66785150..439af6086 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 7e748ce56..624f26c8e 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 c3a7e0d31..616f507a9 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 bc2380751..7a13ef4fd 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 c28bd5222..01f856fcc 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 7a6e771ac..cbabb22a0 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 b4e4ceb5a..4d74e67ae 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 1224b49cd..62bb5e803 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 87f466496..ac91c4998 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 d60272ba0..b9582e72a 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 962fb8110..e4600f434 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 528198b83..07ff2391f 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 ed0bef17c..775d72b8f 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 82f2d3a41..f7fda04ec 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 2c1089051..567380a16 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 575c6a14f..8214065b3 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 6e676c07e..e69a90515 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 04f647e3a..1b4a62b7b 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 682c612d7..4ed59dff1 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 96b573893..dbf817bd7 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 2aae00c99..3689e5622 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 9b8edf222..fa736bee0 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 8308e1b05..5ed5e8a65 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 b3a332dc0..88ef8fb27 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 726e3b5c1..16a787bcd 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 c54adf9ce..574a5d6c2 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 0d9c6f088..7f5b457c6 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 372130480..ed5eae659 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 3e0e30bdf..045e76100 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 c9d0a4795..4f6094320 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 0d7b403bc..891480002 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 e77e3b4fb..b2b30f69f 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 527fe521e..9e967905c 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 4a7e81850..63d55af35 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 3c78f16e5..d03a79f0c 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 c6f1489d1..9d26cca12 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 d2fe33a28..50935c930 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 4daaebcaa..75551609d 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 536e81483..8ea333ed9 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 732d779ad..806ee6e5c 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 fadd3c80d..3dff21beb 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 bed3b6c2a..c1c3d9ee4 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 c6fd8d0e6..f316307cb 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 aaff93192..c94ee23da 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 4d46c39d3..d428038ff 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 59192dcab..e2c95035d 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 55b80630f..963047d91 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 67a1d2edf..81406a693 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 42568bdf6..461c783fb 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 1020655bb..2d32c2bbe 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 9ac28744c..cde23955f 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 a60134f77..e06c5c245 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 4b69f62c6..402edc780 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 d2923ffed..3293a0cba 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 1a936f9d6..a089e7bf4 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 2b5409ce8..6608507c0 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 52b175070..1f8002c41 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 38082fee1..29b46629a 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 9c7cdf303..09402d198 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 0926bb0ea..3739d235d 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 e59e927ad..9a6efcbb0 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 b84073cdf..94fa22b89 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 ad57b46f9..13abc4870 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 73940e833..5ac606ffa 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 8184cadc0..f12433619 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 14a24e9ca..6dacf0874 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 236ac0577..de536e02f 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 11081a7e0..5e17ec84e 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 c3a728042..d884994b0 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 dc5265e97..17449780d 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 2510d81c6..58d470c20 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 ba72ed895..40d1de9fa 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 5d7c6efd1..efe761ae8 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 9d275c145..faaa67b53 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 708fe6c0b..4542ac029 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 17c8d1a7b..1a1e5d539 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 5300dcca2..acdd8b5f2 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 400d0685e..8cb60a9e5 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 2ec3158b9..9abff3376 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 b63d0b6d5..a5b67733f 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 141a2785e..b0730450c 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 25b767ce0..22baa247e 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 bf5d5d568..342d9c1a6 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 c159de9fe..cddc869a2 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 0e6fb1d75..3e3a71fde 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 cc668028f..0d9711c12 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 e21196873..7c867e790 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 d856c3a76..af9effeef 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 5a1e4b804..58f865771 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 58d24fbf3..2d8109f56 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 bbe8d11b6..7625f001f 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 1e2d6ea29..d85445569 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 d3ed40e82..9e9c0ef07 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 de5df68cd..a24ecb09a 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 4369aee8a..bef32327f 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 fb53b5521..5ce220905 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 687cd6ef5..eedcba5d4 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 c4e29d79d..7bb8d0e4b 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 9faffd83a..484b81f2c 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 7ec1e9366..b65185cfe 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 632c59323..5b7214b5e 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 c39bffb71..83267dc55 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 eb0f3073f..2d602323f 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 98df9d5dd..0ff2cd092 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 b4f488a62..c16734e61 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 22db7e9ea..b9aeae487 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 3f1ff2b0f..f8a9b4b6f 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 e83b22078..cd286dd5a 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 8ae2be47d..c2951f601 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 c1a44d772..a3c41b043 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 0ea732991..64f7f9bc8 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 a598d8a66..1d807551c 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 74a433601..e3411990a 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 4b47cf3ff..92d11cbf0 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 bd58919d7..9c8eee1cd 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 81423c21b..34d025263 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 562ca2f2b..dfc012165 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 4fa40e88f..f67d35a99 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 36b7241b1..68855a9df 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 3b2134e9b..e2b1602a2 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 563e95807..d81b2c314 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 5cbbb61e2..c3236483e 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 5633872e1..22ede4bc1 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 a04a717d1..0638b4ed1 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 4791acffc..243983fe6 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 592eb020d..481187b64 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 65ad60173..a0b1afa60 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 af0f4b505..a807bc33b 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 e6aab2994..9c0c622cc 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 cba145afe..1198025a7 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 34e262ab6..3691b0a3f 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 eac9d19b2..315b7dde0 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 8c1f581a7..39dc89206 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 1064b9b60..1dd643809 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 3a0557089..8ea243469 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 7f3dc3f67..fc71a327b 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 42870a70f..1cf3dadad 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 b142576c7..9c4334f0d 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 346ac2525b..246a3d4ac 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 10b884448..bf0a5b6d9 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 43fb021d2..76a83e022 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 2fb041890..8befde850 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 6745b8692..deed52f0d 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 5b8ab14b8..24a5482e0 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 f82988b6e..1db46738d 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 117ecf0db..c02b04946 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 ed8ac898a..2c5af2cd3 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 af9a44c7a..a9bc9c8a2 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 6ab4e16ea..9faf17b90 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 6966ad1a3..dadd4fbe7 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 c9c4f6c92..166559a67 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 c7e187085..a4a6e2c82 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 e32c1da3a..71f461d67 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 9f3dd302b..7660b1976 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 de8b4561a..12e4283a3 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 1cd90b969..d03e67636 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 c3ad06113..9e0b5c1b8 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 4acf05726..eea770291 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 3cd20e673..7b692da01 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 cc10231da..f5849c921 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 7c85c7f1b..da68ea879 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 4d448dff9..c8bcfacbf 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 b760feac4..4e47ce950 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 1fbdf615e..c8cfe9679 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 ecc2fd27a..c52b3aea7 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 bb79e9f4c..4ed83b4a8 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 d393d02bf..e233e4226 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 28206cbdf..144af431f 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 706e13893..12de256e9 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 7611df646..8cf36016f 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 a6d97142b..25b941491 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 b6bb627c0..4291b09e2 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 17e879352..126c25ac0 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 6fedb8b52..25f0856cc 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 ee15e6ad6..3932bdfe2 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 49f6c0ee2..5f7273e16 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 1d3f0c43a..9dc0658f2 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 db9774b05..9d957f4e1 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 79be93024..2779c7c37 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 d794058a7..20ff498cf 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 aa0ccce2d..f65682a1a 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 715ec7b91..d30165652 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 14418a0be..f6fe7cdf3 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 bda6d66dd..a797f453a 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 c8ba927a3..fc90fd872 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 45191ada6..6ca2da6a9 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 b5d305b5b..c431fee93 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 400eb5b66..d653d78f4 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 18adf9236..02784f7ed 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 425c2f72f..e2bb90692 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 cb96e7a40..caf77ad0e 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 e13cd21f2..84703b35d 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 47cbf896f..4c1e8d244 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 bd91dca8b..20d0629fd 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 7f9081cd3..33f4453a2 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 7ee4e5816..960b33df5 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 db80a8e80..c6ebe1643 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 09b5fd2b7..b68a7e021 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 772fb3332..e3b7cff8d 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 d79a4b67e..2fd848910 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 76a66d58a..22ad20471 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 d3b3cabaf..195470507 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 be2408393..c6e3cbd6f 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 c3cb5c46f..64157b2b1 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 5d6c7d8c3..7897da79f 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 a3032b5be..a07e50697 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 411fb4fb6..444a1e9f7 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 204d95713..d23c2aaa7 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 a6ee4f5cb..6d17938e2 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 9b4e0f216..17ccdb8e6 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 bc02e44fd..46fa41342 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 df126fbe1..968535b05 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 c68b2d5dd..bccacf4dd 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 2f0739dcc..7c5955771 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 a2229f2b1..fd0c9072b 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 7d83a1740..831e0d9f3 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 f71e6b195..414ad9e0f 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 d08c534b3..1250de6de 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 8cdc027ce..536f7d541 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 352997c8f..f440358dd 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 b2b7613e9..cc3d138e1 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 29682641e..dfa93c728 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 f6b51b5c9..f50eaf13c 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 8fb861118..ada5b7816 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 8ab4fe219..3fa0e34a7 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 224dd3bab..09dbcb7c0 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 6712ee738..7af4b0800 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 bb11718ab..927eaa61e 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 41ea68211..dc82a3af3 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 5a2465815..31355cb41 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 42f0524ff..ee61ea396 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 1820a813c..c1c5d674b 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 08aaa0d1d..ccaac7100 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 08ee925d7..a28cd9728 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 b89cdf80c..c6d2ce78e 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 48df1d5f6..19d6018b4 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 7d49cf8be..65d73df03 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 8494098fe..9f5002fec 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 0a1ea7bec..57deaebe2 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 6d2cc5e83..9535bd14c 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 602e690b5..f5beaa7d0 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 c7902f989..784a1b077 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 7db6e291d..a4da4639b 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 31e869e71..d6c229f61 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 ae15d2db2..2c877d26e 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 420a8d8a3..74e883c9c 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 b4a2a6352..ceba5f659 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 a40a70d70..28ee13edf 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 bee5e4b0c..afea7b1a4 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 289d32070..51fd89b5c 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 3e8a0637a..1bc0b9b5b 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 d10bcbc1d..a279b5d56 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 9f459d194..be6b2df3e 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 d06fbfc78..6f9251aae 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 8f9e3193d..19616be4f 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 6ca0c6c7f..8618ce7da 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 e5abc252f..10539b634 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 e2ccbf7df..c93b053f3 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 601c25222..5c4c5a6c4 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 f4454536e..b9a7845ef 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 8679b8b43..8389a6e4f 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 74acb67cf..c425dbbe3 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 a6c6b3352..e5565d834 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 be90446ca..d76692d5a 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 7a2011e0e..d3ca0bd57 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 0d5df5595..ad484f89e 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 ae53b1f2c..ceada1e34 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 6a6c6343f..defedad43 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 ed86dd212..d0520aa2e 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 a53a16b3d..93222eb91 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 19836bd04..47a42cff8 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 f92b22bb5..a9fcc6418 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 83f22ca7d..378e35605 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 cfd96f76a..525866571 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 ac84d8782..c931624f0 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 7d05f3659..61361af0d 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 60060994c..ea7a37ccc 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 b1a7ee988..38d00278c 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 78b72cc1b..7c1849ffe 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 e68e1269a..2fa07e19a 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 f80e92f6d..611c5365a 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 3fcf3cffb..3d52417bc 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 038bf4adb..80c30cdad 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 0cc607ec2..fcc74ec42 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 dca26be13..c4ab9c032 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 05b24a8a5..ef6578b3b 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 8748b19d7..84f601921 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 2da7deb2f..817fc41bc 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 c3c12d9dc..1b60b24f1 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 5eb2b48fd..5baefeb6e 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 2f5b709a7..da2624826 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 b0b75b7d8..12f2f3438 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 1cc7c440a..0c5e7e492 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 7f0d6f6fc..850aec555 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 d7ed6af1f..f8453bd6f 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 3405469e5..8da81c810 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 592be757e..553fecc18 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 b87178c22..126d0a3f7 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 952c737ec..0e4824d57 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 d910c6f11..5bbea0a08 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 83dfdbd8c..209adf8b2 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 105acf96a..38cfa75a2 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 ed6aa4ceb..cc6c8d125 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 21ecac2f3..8132aa09b 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 c45306c5c..f4684b8e3 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 92d557370..bb5129957 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 7bb9da59d..f7470953a 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 a40332968..7704a56ee 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 34be2d78d..9210cb3aa 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 e88ccc329..fd6a1d9ef 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 b2b807d4a..ab0828d91 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 8bd9aff0c..264296ee2 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 db2f40ea8..300177086 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 42461cd05..469e1927f 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 8175f8567..234a12255 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 e33da3718..b306330f3 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 00f0e54af..fa45cbefa 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 f65308af0..b617ffa96 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 114daf009..31326f273 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 1631a0eef..a639920f1 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 9be7f2a10..2e9589b1f 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 70fa27a5f..d127a1891 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 f20f0b6b4..5bfdbe9fd 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 15bb02003..fb120c285 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 f3d175acc..7a867c2d3 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 1fe7721d6..481e16273 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 f522db16f..6eeb5a1ef 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 5c268c073..e185f411d 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 2b9503cb9..990ad0785 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 d813afe7c..4e15ae2e1 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 8dcb00e8f..32047f021 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 084e9c5d1..cf30414b3 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 e6ef16459..822378cac 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 5092b0c4d..736dd9539 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 872d19a9c..4d46e9ebf 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 e9ab744cd..f4afbfbc8 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 e113e1baf..20e0ffdd2 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 7eee212ef..49a781c10 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 862dd6c93..22a1be095 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 b50cb81db..25e34fb83 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 039fce87f..4f6cde1b0 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 b099d3c0e..570276744 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 5cb1fd2b5..124e7ee2a 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 025729062..3a21727fd 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 a1cbd3bb2..068f6e28b 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 c154c9456..7804182fa 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 7c8198207..897d8459d 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 90d1a00db..fceb118ca 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 e6ccfdc33..f92182446 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 c288f52f9..44fd4f6f0 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 e51e1901f..bfd1bc311 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 a29ebcb42..4edb23e1a 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 3a9a79099..9a2b58534 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 838085de3..318cc125a 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 7c719214f..5420ede33 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 12169f1ca..9f1ce4f2f 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 b7fec4742..fd089dc13 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 a6d35b1e1..86a5fb96b 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 7757add47..cc94571da 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 8ebe7f541..693b63181 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 faf4d41e0..ec3f762cb 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 098ef87a9..b71782239 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 74531f6ab..31f7b20da 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 bfa76158d..bf47124d1 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 49d0d3b0d..eadfa5707 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 3b0487798..61ca4b154 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 f4b45e05d..3f23798d8 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 acc2032a6..7f7cb47c4 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 82dc07a26..fa4773e4f 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 64d058d23..9c2591dc7 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 25a1fb4c2..e2907a927 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 c06cb3285..bb31004e9 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 bb5e1f87d..456680fb2 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 033dbba5d..fabae3813 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 bc41677b6..b2e048649 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 eb1fb452d..b93107032 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 f93f6686a..fad6c27c6 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 68af6dc68..d16bb3910 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 c15727662..4b1150a13 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 f31bc26b8..a77b0dde4 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 e802585ab..66a783c5f 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 888fbef6d..2922824d9 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 313079159..61a06b4cd 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 a231e7384..0cbdd7340 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 1fb21da61..34a842a27 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 daef77e82..7786ae671 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 f75e1b9a2..ac6f7d3db 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 65768107f..adcb209c5 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 790150d0f..04de482bb 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 356fd6a5c..d6823c9cf 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 b88f43677..2aa28f90e 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 2e6276dca..cd6070a00 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 4cda47bc3..eaf4171ae 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 fe105e2f4..86917ad83 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 c81bea8f6..a05ebf206 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 e10e612fa..fad9d7802 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 691dbea72..8cb14987d 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 a5971e998..b0b208c57 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 639705def..c97b8ea91 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 5933b3561..0601428b9 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 12c2bb28e..ee068891b 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 295d35aa5..08377d333 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 a448f4cff..770abb64e 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 0c89050d6..a49977303 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 fd923fde1..ae2d25d03 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 6aa2034ef..5cd0f439f 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 e37f1188d..dd2677734 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 a2d6b772b..90afb1f7d 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 cd5c1e92c..e9568af23 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 9b667af55..8f9385987 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 379082596..bc8e9f71a 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 0de89b238..35b11927e 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 496ccd8da..b28707f16 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 90aff3a29..2d73ccd39 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 875306816..c036f377e 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 19cd19102..be6b25c3f 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 ff63a8f35..938513ea7 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 131f5ba7f..599f2ec4d 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 6f8e0e6a4..0ce6abd0e 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 2cbe35219..7c0d782e4 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 dd3b64a5f..dad8cf05f 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 bc39c8b89..e1cf424ae 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 08759633b..4088ce4c9 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 1a4ec3fa3..c7b259a20 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 c2be0dbb6..8f834f954 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 c4176fb4d..ebe7a673a 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 b026812af..a5edb82b7 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 2e42ede37..2d872c4d8 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 07277e43f..3da5a4315 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 a9442897d..14d8e9cf5 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 29748df6a..a2403e32b 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 d295dbda8..c5c9c1dc6 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 f662e5f45..ff4b1f543 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 5f6812817..723aa9955 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 e4f2b4122..3a01b5171 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 a6298a1e7..c7a8f9ee9 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 4f70607fc..e8f26fa15 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 0ef08a87a..87be42dc6 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 9a1784763..28709ff63 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 2815ffeba..47d73bfdd 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 977d5da90..ba8a0c51e 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 8a8c86977..5fda10a62 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 910c45a86..506e21a69 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 0aed9c4cd..c8b3c5b92 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 e2a4e2d0f..c05b4e7a9 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 dca4a71ab..8fc23c5c0 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 6425ed6e2..e682fc767 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 1e0bb5ce9..2f041b0e2 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 a54cfeaa3..175c648ab 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 f646b5746..f29b5125a 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 b76615d70..11f85a958 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 b7645b5dd..ffee9758e 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 433a90c3b..2033973f7 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 d308c73a2..51faecd7b 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 76b9a3c06..6d100b980 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 6d079fbe1..fc4e21200 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 08b64d8b2..8b6f13e87 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 8926d17fd..0bf0cc337 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 fe5a136e1..b9f1c92bd 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 429eb859c..f2a1994f1 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 5942752c2..4f0395d7f 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 853dc6b12..8def9bde7 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 c66d923f9..3612f7b4e 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 8a37bcca0..b0c1679c5 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 c52e54717..b33cd5354 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 bbbb9bd07..c6d72d37e 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 7de88248e..d9699f592 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 4b84c604b..58b82cfa4 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 e720ec90b..e82be49c5 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 8784e68f1..3fe44a48f 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 16c966aa7..64cc5bef8 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 010e43bb1..2d7dd0283 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 0290aa888..e4b79dfd0 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 8ac004308..3e148c3ba 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 f15c55475..32a3fe528 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 24a8fc615..295c4c102 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 0f5ef7946..9e13b0928 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 54ba0397b..ceec413b8 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 a8b0c9627..3214db9b0 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 adf7985b3..59d23e974 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 62fa6d789..f7a9b9f3c 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 13bf2b7da..dffd3a3bf 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 aa6d1df60..4e4a46be9 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 d2c075e10..e9728bb5d 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 3064d1fec..41c9bca3e 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 d19e6fd8a..a094b7975 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 c9ebbd5af..239da4364 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 e726150a2..ba1c8bfdd 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 3eea9036e..c2db3a059 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 3adfee152..a23be6841 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 1237b89fd..027c28945 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 44ffdf71d..94a13db93 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 d36529956..8a08f1686 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 c62659edb..2f46f4a2a 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 32ebe0be1..be6f25ea3 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 4ee752b8a..4d2e46484 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 40ed1e402..e7c0b062f 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 525827ad2..848f07715 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 dd3caea97..bbd07ecc2 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 9200cda36..02eca3062 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 5e8f28756..417a35a97 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 04a261d73..3ee5e3f90 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 bb48b506f..56be59caa 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 2916d7794..d5050fc5f 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 599585170..7d6b04942 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 d869f81d7..f04347d3a 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 63e1fba7f..34fe0bb0a 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 536b482b5..f917c75f0 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 6ce73f1a2..46f95919c 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 1b03be7b7..774b63084 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 e77908061..544f9c4d7 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 e1c8de960..34562a207 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 b3905f7bd..8a0d4ba3b 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 5f4cce062..971ca5f7d 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 2b5a2338c..a875ba40a 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 572991705..109b887d8 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 6a0693c16..5b6242d63 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 b1d4851e7..ae1431e97 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 623ab154e..a79697e51 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 a14ed6637..08334124a 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 8936a1a9f..b28770b81 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 5ff3db6da..2fae32556 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 826baee54..9159c5bbc 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 02bc4b1b9..5dd0ffc93 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 e3b0ed610..6dfbe2c08 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 8b89be7ab..65155c2c5 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 c5b1eca74..297f60146 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 5a1370e0e..f2406a6f1 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 73386fe1b..c913d0844 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 f738ee79b..269331f9e 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 d586a8f58..ebd6d3106 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 0c1262b9d..1d2ae0bde 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 d8069f124..572634c08 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 3ccab5861..0762335d5 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 110275178..2b44b4e31 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 0e8fc3b92..5dbfc01ee 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 0d573bd15..3615f59e2 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 231f2aa5c..577b5daa6 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 5ce6f9e7f..9550cbe88 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 4d0bddd60..cdbf0db78 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 c915edc40..93293ba98 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 998e2fc63..6cb65bd66 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 611bc6af4..d111899e9 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 c45bbeca0..ee8e5af16 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 0beeeac66..31253f6aa 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 bdf6b4ce0..132e45c70 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 17461b18a..0b99732c0 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 acc58c713..92f9c0a8a 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 3a6231894..25b60910d 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 8e647581e..ae7aa724c 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 e4c323a4b..5369770bc 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 755699c87..27ec7907f 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 51d2fa07b..a94e5b6ec 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 ac92a2b36..15e730d67 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 da3708347..0b0287de9 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 65478487c..6458c7418 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 42e79b832..71d753343 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 d1d19f981..0f80fbce5 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 a99ddf869..ea77d4cd5 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 2f2b6fd00..b6e09f4dd 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 f3fd87752..db5bc9482 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 7b84dd1f0..285e3492e 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 c1f731508..792620187 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 ae417a6f2..b0e9fe29b 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 6cc0f6ea4..1638ba73e 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 63467eb67..28324cf1d 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 cbab4614b..6ef1d87d6 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 a4f59dbf9..2d9847ae4 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 deabaab65..892a91970 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 d252c610d..66c4d47b8 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 87ccc292a..cc7aaaee0 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 a7a1c4bb8..7cc4c8f22 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 99347e337..60a7ea1fe 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 5bfa3c115..fc306e5f0 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 5f34ff6db..20f6f0bab 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 c80a29eb1..88d71025f 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 eb0680ed4..25dfca326 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 21b8c674f..842b6511c 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 12c8e4268..50e1c42e2 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 fcf9cf500..b98c89086 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 21d27aaf8..cfe491ad0 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 cc5c9e649..d2660c6a6 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 6f128b4a8..cee36db73 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 a50a3e959..6e858e6f9 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 2f00bad21..481512a7f 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 658a24aa6..e6ef346ca 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 b35b57b2e..3f6c2e0ff 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 66251101f..dd23db094 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 cc2279254..f83120d2c 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 08fff08fe..d1fa48ec7 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 9d3e72332..47bf72aea 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 f46909311..00d656bd9 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 bcfb2c12e..dedcd3ddc 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 39abb8363..e329cc78d 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 11f07fde7..47967d767 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 5ee635d22..cce794001 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 dbf06dcf6..89da1a629 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 7d38c6963..e5eadd6a0 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 0bf9369f9..c8191135c 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 d017ff999..cf61e8bae 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 74a83cbab..885e79f87 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 ff46c0b30..d718a56fb 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 077a09372..f2a0c438f 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 6c02eddd2..7364a34ea 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 302330fb2..c6bee6191 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 5fa53128b..09ecfe9c9 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 03a167112..f1df40d85 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 7f1e79145..e3f21a1f8 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 68d3d5720..e63c67ae2 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 77d8dfe00..8d7b5e387 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 d1d15582f..f7d658ecd 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 98d384d60..b44ee59f2 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 eba0b8bef..7c5421a0f 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 5a1f62352..5e5f3935a 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 2145738a7..fe5f1c933 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 e5ee621cd..739a1033e 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 8c374f658..2fc10f3c7 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 bf9973619..c372f0ed2 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 9fdcabd60..40421224b 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 a4d92010a..229ca8ad7 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 b021279bd..a036206cb 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 c93010e3f..779a47e9d 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 6290e226b..55e6e73d8 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 ce44f3b84..336ca1960 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 fd0ad2e55..2fbd89324 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 ad2db0514..80471afdc 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 062fdba17..5fe1c75a2 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 45fa99ac8..76dc0abba 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 8cf8080e4..76df1c800 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 049908e55..e95641308 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 a395e04f8..b8768407d 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 088bb43c5..981348b85 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 9e4560377..8e04aa7c6 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 4365cd742..6bcdf1dc0 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 4163ad64b..1cf5084f2 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 55e1c7c7b..dd05aaa4c 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 3e68106e6..a4c7793d6 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 200ccbe48..afb8800bd 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 6d6fbfbbe..05bf95128 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 55612d39a..6996c84d4 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 4012a4f0f..a42de133e 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 f4c45dc18..74cbe25a5 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 ed6a1f36c..69a985082 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 d8916b6bd..e3bc39973 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 6b3dc7b19..5d9c5df04 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 e4934d1dd..e9e8483f6 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 8f29139b2..841cd557e 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 01a6a98a9..2a9b5623b 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 4abd7d1dc..16fc9d018 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 285453eb0..dc53f7418 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 f499b5c53..5633bb6bb 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 b600d6c12..911481c32 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 b32a5ba46..90a1c39ef 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 93d994eb6..ea729b478 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 8875aed8c..9773a5b40 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 f46e99b77..bb01977d3 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 403616c63..b061621d6 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 d3e6ccd63..418b2d836 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 38b5ce40e..260e55eda 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 b0d1ab284..209a8324b 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 cc374cf4e..6cd5a5f1a 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 021829244..b5d04a245 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 67464ef7f..51388e9e4 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 6ac77ead5..4a21065ab 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 a746816e4..97842a52e 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 e3d473bf6..bf8e39cf4 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 bd06ad1c4..cdb6b92f4 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 f406573e4..2e561acc3 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 503c30157..88f2e9e3d 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 1650f0571..94bd4bbf5 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 c088a9e78..641bd7778 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 86fb527fc..039fe4a95 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 173229d01..970fc4ade 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 1678fe786..baa21277b 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 e7f49b3b4..144461f7d 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 9123ce5e5..d108c1d4e 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 178a31e2f..35b14aec7 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 9f9121f5f..787afcf29 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 9f27a4d47..da47c2f4a 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 d48b80aad..37719683f 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 27c35eeca..073da71d9 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 cb5fe632e..8346a1c9a 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 faf7c9396..21439ce57 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 2e05e84ed..88360c11c 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 edb33e842..e144c45ba 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 7ed4d57c4..623b1aac4 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 18865c755..455465778 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 1b5827756..d746284fd 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 83b864be9..b123c6a01 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 500881389..638a61a7a 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 0d07578f5..8d55128e9 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 d80c83c11..adf1a6524 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 1aed140ee..e300cabdd 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 3b377dd94..0f0dee310 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 e80ca5a64..252bc57c3 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 43eaa6c7b..2361f6352 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 084f7415e..f63ce62be 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 7d2dc8fb5..70f0e7d32 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 b7fff3f8e..b8d6d910e 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 569d59f2d..30cee4e3e 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 dd2448589..c05ce1f41 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 896db4d85..7a693c5b2 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 e2dcc691c..f2f90c901 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 c79e2ae2c..9e6de0989 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 48d2e6017..013e24e34 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 cebb0f8bb..21c4a26ab 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 d64d29f2f..19b398b23 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 14b239b49..7bbe441b1 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 f8909be9d..d6ac2a7b4 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 946b79015..7284bd43d 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 b13b47485..dc19a9032 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 d647b94cd..488e6c3c7 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 9a74daee2..ae82d1ee4 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 d07c7b50a..d08b20df1 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 f343e1d06..2b36ff984 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 0a284b342..595c6075a 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 ac68698ab..4fb4d6fe3 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 beec5efa9..fa5e9bd17 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 ebfbb0df6..aff74e5f5 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 bc749dc09..83b9edf1c 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 d7703b034..8123473ce 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 bcb3fed1b..6c5a0b9bc 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 abaa91fb6..1ecc1ae1a 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 775d8f8d8..551ae4de0 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 1abd32143..72e552b1e 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 6477a227a..110321bf2 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 6937f92a7..f29930e20 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 7e3357c6e..bb3179948 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 692e5a6af..171145a28 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 772d975c4..5c8607374 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 1aef70e39..e4d58b5bd 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 7e59f6adf..e5b69ade0 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 eef95fda0..fdf903232 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 c6e3f4753..ebb07a3f5 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 55dd81d53..70e9c1fe0 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 167ae0efa..475065719 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 b55b11fba..2f302830a 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 3493d9bad..6ea35087a 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 e4b059292..380da18e4 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 62b8cadba..4d44417e7 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 0804dc6df..d280f0183 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 4c9dffd36..c530d479e 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 e0be5e1e4..d1e8e5aba 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 10b2d0807..84f69c1e8 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 dd7100c93..b36c7d627 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 418dfe510..ab8432104 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 0f00082e2..4f42acbbf 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 3a0ee7374..854e37c8a 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 68de037b6..b959f1da8 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 3a80bf98e..0fadf2d82 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 6cbf97e59..bbd0eee18 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 c1d5b0e5d..b0086a813 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 366971592..90a4a7b67 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 f4b1871fa..69572fd5d 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 bc968d5b9..348550939 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 8dbe2bc4b..8f78adcea 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 95596ace8..7061d7bb6 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 d3b38e6a9..05d400b48 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 39f320b7b..1d250d22c 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 ee3ad62db..98eef5684 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 296a22325..8ecf859ea 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 4cdbae544..3e5ede5f5 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 a6a08f1f1..3814abb65 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 81ccb762b..38480c19f 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 6d0bbbfef..d9d3cca70 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 ae3379e54..699e1b42d 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 0fcda1c1b..2009854a1 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 e8eebe5c8..7dbe27263 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 9634c0674..32db43a38 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 a299ba425..d8b4a12d0 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 4c0977011..1095f35f9 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 1f3301241..fc2935e91 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 d0210ac21..0282c62c6 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 6f9879a59..a42b477c5 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 86c78b298..71f43fbef 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 99f0aa163..bb35dbffa 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 0094cb6bc..66fed94f0 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 fd3e89c35..4ae10c03b 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 3a16d65fe..535cab9bb 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 c79d5e893..a0f505f40 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 a0fe7e64c..5c59c13ab 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 b7a0e8f83..6e320f22e 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 0bc74e766..95f0731c4 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 a1d104e81..119164b0a 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 e0dffb3a9..472fffe76 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 543a75aeb..b3e146d12 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 61d0de996..b1fe82cd3 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 67d771b3e..99842d954 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 9e9499370..d0a7b7bc2 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 d286cc0a8..e5c827b84 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 ee4e18e82..feda93bb7 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 b6c8bca35..e79cd54e1 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 479f8c59f..8a9b54eee 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 4909e30f2..3a2b1d4b6 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 a6875079a..2674e29e2 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 0d5f1c11e..a5d338c78 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 81c5c7781..798d2c5c2 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 bfe1e0fe7..cc0917b2a 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 eaeaf0803..6bbf51a7f 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 6b4080524..d55c83895 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 51711ca72..b6ab30e8d 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 dc0e665ea..aac9d9f85 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 9d02b1f1f..9f133039f 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 {