summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/sheet
diff options
context:
space:
mode:
Diffstat (limited to 'offapi/com/sun/star/sheet')
-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
229 files changed, 0 insertions, 1614 deletions
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 014b5c84b82f..52ca2a603eec 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sheet_AccessibleCell_idl__
#define __com_sun_star_sheet_AccessibleCell_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
#include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 10e77f7bcbc6..29492a7971cb 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AccessibleCsvCell_idl__
#define __com_sun_star_sheet_AccessibleCsvCell_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 1ee7df9ddba1..86562c70345b 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AccessibleCsvRuler_idl__
#define __com_sun_star_sheet_AccessibleCsvRuler_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 95f4a91bdf6a..ca8e9a7ee553 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_AccessibleCsvTable_idl__
#define __com_sun_star_sheet_AccessibleCsvTable_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index b7e919c29b1b..aa290fc7f388 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
#define __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index 4a89ad0bcd30..9d01b98dd6db 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheet_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheet_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
#include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 1d6425b400fc..f72dc383b649 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
#include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index 20b612071312..a06526caf73f 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
#define __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ActivationEvent.idl b/offapi/com/sun/star/sheet/ActivationEvent.idl
index f53c3509874b..136932433380 100644
--- a/offapi/com/sun/star/sheet/ActivationEvent.idl
+++ b/offapi/com/sun/star/sheet/ActivationEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_ActivationEvent_idl__
#define __com_sun_star_sheet_ActivationEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/AddIn.idl b/offapi/com/sun/star/sheet/AddIn.idl
index 8f76f268416e..8a7bbaf5125d 100644
--- a/offapi/com/sun/star/sheet/AddIn.idl
+++ b/offapi/com/sun/star/sheet/AddIn.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_AddIn_idl__
#define __com_sun_star_sheet_AddIn_idl__
-#ifndef __com_sun_star_lang_XServiceName_idl__
#include <com/sun/star/lang/XServiceName.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAddIn_idl__
#include <com/sun/star/sheet/XAddIn.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
#include <com/sun/star/sheet/XCompatibilityNames.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotation.idl b/offapi/com/sun/star/sheet/CellAnnotation.idl
index 16c2f3620639..b29c11763166 100644
--- a/offapi/com/sun/star/sheet/CellAnnotation.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_CellAnnotation_idl__
#define __com_sun_star_sheet_CellAnnotation_idl__
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSimpleText_idl__
#include <com/sun/star/text/XSimpleText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotationShape.idl b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
index 1d5cc467f299..77d84bfd42c4 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationShape.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAnnotationShape_idl__
#define __com_sun_star_sheet_CellAnnotationShape_idl__
-#ifndef __com_sun_star_drawing_CaptionShape_idl__
#include <com/sun/star/drawing/CaptionShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotations.idl b/offapi/com/sun/star/sheet/CellAnnotations.idl
index 5831655d4634..81b705cc41e1 100644
--- a/offapi/com/sun/star/sheet/CellAnnotations.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotations.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_CellAnnotations_idl__
#define __com_sun_star_sheet_CellAnnotations_idl__
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
index 1e70eb30c5c3..a54f2562e718 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
#define __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLink.idl b/offapi/com/sun/star/sheet/CellAreaLink.idl
index 90e51f941eb8..f251511b2484 100644
--- a/offapi/com/sun/star/sheet/CellAreaLink.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLink.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_CellAreaLink_idl__
#define __com_sun_star_sheet_CellAreaLink_idl__
-#ifndef __com_sun_star_sheet_XAreaLink_idl__
#include <com/sun/star/sheet/XAreaLink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLinks.idl b/offapi/com/sun/star/sheet/CellAreaLinks.idl
index 62b601752c10..ff822d1535fd 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinks.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_CellAreaLinks_idl__
#define __com_sun_star_sheet_CellAreaLinks_idl__
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
index 6fda9e4f824d..f7bd7a421d7e 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
#define __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellFormatRanges.idl b/offapi/com/sun/star/sheet/CellFormatRanges.idl
index c3002e1c80f6..7a7541fa42c6 100644
--- a/offapi/com/sun/star/sheet/CellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_CellFormatRanges_idl__
#define __com_sun_star_sheet_CellFormatRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
index ef945a036225..4cfd44edb5c0 100644
--- a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
#define __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Cells.idl b/offapi/com/sun/star/sheet/Cells.idl
index 125c42f516c2..45eecae78733 100644
--- a/offapi/com/sun/star/sheet/Cells.idl
+++ b/offapi/com/sun/star/sheet/Cells.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_Cells_idl__
#define __com_sun_star_sheet_Cells_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/CellsEnumeration.idl b/offapi/com/sun/star/sheet/CellsEnumeration.idl
index 53e7a59a86e1..7315a4cd28e0 100644
--- a/offapi/com/sun/star/sheet/CellsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_CellsEnumeration_idl__
#define __com_sun_star_sheet_CellsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 12a8fd5db8e1..895b93586c5d 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ComplexReference_idl__
#define __com_sun_star_sheet_ComplexReference_idl__
-#ifndef __com_sun_star_sheet_SingleReference_idl__
#include <com/sun/star/sheet/SingleReference.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
index 7c070b721ee4..07c0f742ddee 100644
--- a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ConsolidationDescriptor_idl__
#define __com_sun_star_sheet_ConsolidationDescriptor_idl__
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELink.idl b/offapi/com/sun/star/sheet/DDELink.idl
index 0ef60285ed3c..b8673a8135be 100644
--- a/offapi/com/sun/star/sheet/DDELink.idl
+++ b/offapi/com/sun/star/sheet/DDELink.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DDELink_idl__
#define __com_sun_star_sheet_DDELink_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
#include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
#include <com/sun/star/sheet/XDDELinkResults.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinkInfo.idl b/offapi/com/sun/star/sheet/DDELinkInfo.idl
index 96c4b8e5c244..d81168556d6d 100644
--- a/offapi/com/sun/star/sheet/DDELinkInfo.idl
+++ b/offapi/com/sun/star/sheet/DDELinkInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_DDELinkInfo_idl__
#define __com_sun_star_sheet_DDELinkInfo_idl__
-#ifndef __com_sun_star_sheet_DDEItemInfo_idl__
#include <com/sun/star/sheet/DDEItemInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinks.idl b/offapi/com/sun/star/sheet/DDELinks.idl
index 8a8d8b093756..4b01686b2317 100644
--- a/offapi/com/sun/star/sheet/DDELinks.idl
+++ b/offapi/com/sun/star/sheet/DDELinks.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_DDELinks_idl__
#define __com_sun_star_sheet_DDELinks_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sheet_XDDELinks_idl__
#include <com/sun/star/sheet/XDDELinks.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
index 93a19a052c88..559d5d097395 100644
--- a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DDELinksEnumeration_idl__
#define __com_sun_star_sheet_DDELinksEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 939ff469b674..1d6752d63658 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotTableDescriptor_idl__
#define __com_sun_star_sheet_DataPilotTableDescriptor_idl__
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
#include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl b/offapi/com/sun/star/sheet/DataPilotField.idl
index 68a4fa1c1e2c..486e5aaf16c2 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_sheet_DataPilotField_idl__
#define __com_sun_star_sheet_DataPilotField_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
#include <com/sun/star/sheet/XDataPilotFieldGrouping.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
#include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
#include <com/sun/star/sheet/DataPilotFieldReference.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldLayoutInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldLayoutInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldAutoShowInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldSortInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index da07a768a57d..b0d48dfd7c17 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroup_idl__
#define __com_sun_star_sheet_DataPilotFieldGroup_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
index f486cb0d689a..97ab46ca8505 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 380dab374dc5..1c8bd723e61b 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
index 40a65552aa99..8753f2ea5e7a 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 544863db4d4b..0b7df0436660 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroups_idl__
#define __com_sun_star_sheet_DataPilotFieldGroups_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
index 6b94a42df494..366eb173bbe0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
index 163917c79b78..f094cbcd8993 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
#define __com_sun_star_sheet_DataPilotFieldReference_idl__
-#ifndef __com_sun_star_sheet_DataPilotFieldReferenceItemType_idl__
#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
index b024613d6e51..0758eb4f29f0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
#define __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
-#ifndef __com_sun_star_sheet_DataPilotFieldSortMode_idl__
#include <com/sun/star/sheet/DataPilotFieldSortMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFields.idl b/offapi/com/sun/star/sheet/DataPilotFields.idl
index 1b3946bc88dc..32197631e138 100644
--- a/offapi/com/sun/star/sheet/DataPilotFields.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFields.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotFields_idl__
#define __com_sun_star_sheet_DataPilotFields_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
index e96099eae8f7..e5f554f19ac9 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItem.idl b/offapi/com/sun/star/sheet/DataPilotItem.idl
index 84be9bdc879a..6b6e0b94eb3e 100644
--- a/offapi/com/sun/star/sheet/DataPilotItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItem.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotItem_idl__
#define __com_sun_star_sheet_DataPilotItem_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItems.idl b/offapi/com/sun/star/sheet/DataPilotItems.idl
index edc3bd474e04..832fdda81046 100644
--- a/offapi/com/sun/star/sheet/DataPilotItems.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItems.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotItems_idl__
#define __com_sun_star_sheet_DataPilotItems_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
index 074beb4e6215..526691277d81 100644
--- a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
#define __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl b/offapi/com/sun/star/sheet/DataPilotSource.idl
index 3629d48fd756..4e5a000343c3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_DataPilotSource_idl__
#define __com_sun_star_sheet_DataPilotSource_idl__
-#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
#include <com/sun/star/sheet/XDimensionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
#include <com/sun/star/sheet/XDataPilotResults.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 9f5961731a05..82d4294a5636 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_sheet_DataPilotSourceDimension_idl__
#define __com_sun_star_sheet_DataPilotSourceDimension_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
#include <com/sun/star/sheet/XHierarchiesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
#include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableFilterField_idl__
#include <com/sun/star/sheet/TableFilterField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index 080f529e90e4..ebb58eda79f3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceDimensions_idl__
#define __com_sun_star_sheet_DataPilotSourceDimensions_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index f283e157c8e1..83d907bc6800 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
#define __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
index ad300f8845e6..f228b9908e70 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
#define __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
#include <com/sun/star/sheet/XLevelsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
index c94880508a2c..a20a193e068b 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_DataPilotSourceLevel_idl__
#define __com_sun_star_sheet_DataPilotSourceLevel_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
#include <com/sun/star/sheet/XMembersSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
#include <com/sun/star/sheet/XDataPilotMemberResults.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
index 5e09f51de346..9c00787bdfab 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceLevels_idl__
#define __com_sun_star_sheet_DataPilotSourceLevels_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
index c83f1031e57a..56ddd6250d1a 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotSourceMember_idl__
#define __com_sun_star_sheet_DataPilotSourceMember_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
index 02a93be58504..668e2fabb2d1 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotSourceMembers_idl__
#define __com_sun_star_sheet_DataPilotSourceMembers_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index 19c5b143a952..0a1c07985ec6 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_DataPilotTable_idl__
#define __com_sun_star_sheet_DataPilotTable_idl__
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTables.idl b/offapi/com/sun/star/sheet/DataPilotTables.idl
index f8dc00fa8e27..bdb3192d1564 100644
--- a/offapi/com/sun/star/sheet/DataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTables.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sheet_DataPilotTables_idl__
#define __com_sun_star_sheet_DataPilotTables_idl__
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
index a8b52e65425c..72b8f67c47a7 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
#define __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
index 0044b8801a03..d6ef37d58fc7 100644
--- a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DatabaseImportDescriptor_idl__
#define __com_sun_star_sheet_DatabaseImportDescriptor_idl__
-#ifndef __com_sun_star_sheet_DataImportMode_idl__
#include <com/sun/star/sheet/DataImportMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index 1a2e189ff14e..a906198a7fda 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_sheet_DatabaseRange_idl__
#define __com_sun_star_sheet_DatabaseRange_idl__
-#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
#include <com/sun/star/sheet/XDatabaseRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRanges.idl b/offapi/com/sun/star/sheet/DatabaseRanges.idl
index aed4f86aa308..68a12a622bbe 100644
--- a/offapi/com/sun/star/sheet/DatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRanges.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_DatabaseRanges_idl__
#define __com_sun_star_sheet_DatabaseRanges_idl__
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
index 56dde2367734..2e2cc1725312 100644
--- a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
#define __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl
index 17bc923477dd..62f8f0dc6f53 100644
--- a/offapi/com/sun/star/sheet/DocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/DocumentSettings.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_DocumentSettings_idl__
#define __com_sun_star_sheet_DocumentSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index 0ad8d6dadeb4..9abac7c24def 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
#define __com_sun_star_sheet_ExternalLinkInfo_idl__
-#ifndef __com_sun_star_sheet_ExternalLinkType_idl__
#include <com/sun/star/sheet/ExternalLinkType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index 0c80854db357..6c70247a672f 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#define __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index acf4eca4910b..8fac32c8bd31 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_sheet_FormulaParser_idl__
#define __com_sun_star_sheet_FormulaParser_idl__
-#ifndef __com_sun_star_beans_PropertySet_idl__
#include <com/sun/star/beans/PropertySet.idl>
-#endif
-#ifndef __com_sun_star_sheet_XFormulaParser_idl__
#include <com/sun/star/sheet/XFormulaParser.idl>
-#endif
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
#include <com/sun/star/sheet/ExternalLinkInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl
index 389acca5daa0..e9ab212f001c 100644
--- a/offapi/com/sun/star/sheet/FunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/FunctionAccess.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_FunctionAccess_idl__
#define __com_sun_star_sheet_FunctionAccess_idl__
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
#include <com/sun/star/sheet/XFunctionAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescription.idl b/offapi/com/sun/star/sheet/FunctionDescription.idl
index 2e36034ea76b..31f57d0aa969 100644
--- a/offapi/com/sun/star/sheet/FunctionDescription.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FunctionDescription_idl__
#define __com_sun_star_sheet_FunctionDescription_idl__
-#ifndef __com_sun_star_sheet_FunctionArgument_idl__
#include <com/sun/star/sheet/FunctionArgument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
index 6749ea019903..0fd69f684c49 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
#define __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptions.idl b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
index 842979bb4d1e..18fa549f3c7c 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_FunctionDescriptions_idl__
#define __com_sun_star_sheet_FunctionDescriptions_idl__
-#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
#include <com/sun/star/sheet/XFunctionDescriptions.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 508992fd1785..ec6cbdaaee2f 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_GlobalSheetSettings_idl__
#define __com_sun_star_sheet_GlobalSheetSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/HeaderFooterContent.idl b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
index 39c551c0880c..0ce900c9b1c5 100644
--- a/offapi/com/sun/star/sheet/HeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_HeaderFooterContent_idl__
#define __com_sun_star_sheet_HeaderFooterContent_idl__
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRange.idl b/offapi/com/sun/star/sheet/LabelRange.idl
index a5e1b98302a2..62781cc7771a 100644
--- a/offapi/com/sun/star/sheet/LabelRange.idl
+++ b/offapi/com/sun/star/sheet/LabelRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LabelRange_idl__
#define __com_sun_star_sheet_LabelRange_idl__
-#ifndef __com_sun_star_sheet_XLabelRange_idl__
#include <com/sun/star/sheet/XLabelRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRanges.idl b/offapi/com/sun/star/sheet/LabelRanges.idl
index d8659f7a625b..83510c6141ab 100644
--- a/offapi/com/sun/star/sheet/LabelRanges.idl
+++ b/offapi/com/sun/star/sheet/LabelRanges.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_LabelRanges_idl__
#define __com_sun_star_sheet_LabelRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
index 18817df0d228..00830e32aba0 100644
--- a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LabelRangesEnumeration_idl__
#define __com_sun_star_sheet_LabelRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/LocalizedName.idl b/offapi/com/sun/star/sheet/LocalizedName.idl
index 1f8a7a8eebf6..1d6c7b7d2ead 100644
--- a/offapi/com/sun/star/sheet/LocalizedName.idl
+++ b/offapi/com/sun/star/sheet/LocalizedName.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_LocalizedName_idl__
#define __com_sun_star_sheet_LocalizedName_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 445bf984c7e6..8dd4a7727b93 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_NamedRange_idl__
#define __com_sun_star_sheet_NamedRange_idl__
-#ifndef __com_sun_star_sheet_XNamedRange_idl__
#include <com/sun/star/sheet/XNamedRange.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRanges.idl b/offapi/com/sun/star/sheet/NamedRanges.idl
index e7be40c8c6e5..2f062d84016d 100644
--- a/offapi/com/sun/star/sheet/NamedRanges.idl
+++ b/offapi/com/sun/star/sheet/NamedRanges.idl
@@ -28,22 +28,11 @@
#ifndef __com_sun_star_sheet_NamedRanges_idl__
#define __com_sun_star_sheet_NamedRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
index 9bfeea931a01..0c369730cc9a 100644
--- a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_NamedRangesEnumeration_idl__
#define __com_sun_star_sheet_NamedRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl
index b427b67f28ea..f4edee3fad01 100644
--- a/offapi/com/sun/star/sheet/NoConvergenceException.idl
+++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_NoConvergenceException_idl__
#define __com_sun_star_sheet_NoConvergenceException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
index 859466b51d5d..b1789b764ab1 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#define __com_sun_star_sheet_RangeSelectionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 636a0bcf8f31..588b2b671641 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_RecentFunctions_idl__
#define __com_sun_star_sheet_RecentFunctions_idl__
-#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
#include <com/sun/star/sheet/XRecentFunctions.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ResultEvent.idl b/offapi/com/sun/star/sheet/ResultEvent.idl
index 3fc5184da6ae..ed77a0710244 100644
--- a/offapi/com/sun/star/sheet/ResultEvent.idl
+++ b/offapi/com/sun/star/sheet/ResultEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ResultEvent_idl__
#define __com_sun_star_sheet_ResultEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Scenario.idl b/offapi/com/sun/star/sheet/Scenario.idl
index a47b2c3df484..bb9632b04698 100644
--- a/offapi/com/sun/star/sheet/Scenario.idl
+++ b/offapi/com/sun/star/sheet/Scenario.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_Scenario_idl__
#define __com_sun_star_sheet_Scenario_idl__
-#ifndef __com_sun_star_sheet_XScenario_idl__
#include <com/sun/star/sheet/XScenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
#include <com/sun/star/sheet/XScenarioEnhanced.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Scenarios.idl b/offapi/com/sun/star/sheet/Scenarios.idl
index 31f3da181f0b..b20438c9af53 100644
--- a/offapi/com/sun/star/sheet/Scenarios.idl
+++ b/offapi/com/sun/star/sheet/Scenarios.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_Scenarios_idl__
#define __com_sun_star_sheet_Scenarios_idl__
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
index ca6c0a7b8335..fc6090d1e8f1 100644
--- a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
+++ b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_ScenariosEnumeration_idl__
#define __com_sun_star_sheet_ScenariosEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl
index 0aca01b81b52..38c6f29171df 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sheet_Shape_idl__
#define __com_sun_star_sheet_Shape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl
index c1117388ff35..7b82aa8c4c35 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -29,95 +29,32 @@
#define __com_sun_star_sheet_SheetCell_idl__
-#ifndef __com_sun_star_table_Cell_idl__
#include <com/sun/star/table/Cell.idl>
-#endif
-
-#ifndef __com_sun_star_text_Text_idl__
#include <com/sun/star/text/Text.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
#include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellAddressable_idl__
#include <com/sun/star/sheet/XCellAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
#include <com/sun/star/sheet/XSheetAnnotationAnchor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
#include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellCursor.idl b/offapi/com/sun/star/sheet/SheetCellCursor.idl
index 23724f423174..eaaa9e2682f8 100644
--- a/offapi/com/sun/star/sheet/SheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/SheetCellCursor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_SheetCellCursor_idl__
#define __com_sun_star_sheet_SheetCellCursor_idl__
-#ifndef __com_sun_star_table_CellCursor_idl__
#include <com/sun/star/table/CellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
#include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
#include <com/sun/star/sheet/XSheetCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
#include <com/sun/star/sheet/XUsedAreaCursor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl b/offapi/com/sun/star/sheet/SheetCellRange.idl
index d841d6e1eef0..a275751feca9 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -29,135 +29,42 @@
#define __com_sun_star_sheet_SheetCellRange_idl__
-#ifndef __com_sun_star_table_CellRange_idl__
#include <com/sun/star/table/CellRange.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XMergeable_idl__
#include <com/sun/star/util/XMergeable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
#include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
#include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
#include <com/sun/star/sheet/XCellRangeFormula.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
#include <com/sun/star/sheet/XCellRangeAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellSeries_idl__
#include <com/sun/star/sheet/XCellSeries.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
#include <com/sun/star/sheet/XArrayFormulaRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
#include <com/sun/star/sheet/XMultipleOperation.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XImportable_idl__
#include <com/sun/star/util/XImportable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
#include <com/sun/star/sheet/XSubTotalCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
#include <com/sun/star/sheet/XSheetFilterableEx.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
#include <com/sun/star/sheet/XCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
#include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index 7a265d1e2cd6..14272aa36e36 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -29,67 +29,25 @@
#define __com_sun_star_sheet_SheetCellRanges_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceable_idl__
#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
#include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
#include <com/sun/star/sheet/XSheetCellRangeContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
index f0989e3cffd2..173c4b180de5 100644
--- a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
#define __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLink.idl b/offapi/com/sun/star/sheet/SheetLink.idl
index b81b79ce19be..4dd3ce69c0b6 100644
--- a/offapi/com/sun/star/sheet/SheetLink.idl
+++ b/offapi/com/sun/star/sheet/SheetLink.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_SheetLink_idl__
#define __com_sun_star_sheet_SheetLink_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
#include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLinks.idl b/offapi/com/sun/star/sheet/SheetLinks.idl
index ee960b37e57c..5f9d7e603361 100644
--- a/offapi/com/sun/star/sheet/SheetLinks.idl
+++ b/offapi/com/sun/star/sheet/SheetLinks.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_SheetLinks_idl__
#define __com_sun_star_sheet_SheetLinks_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
index 85749701c85a..02cc2696b21b 100644
--- a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SheetLinksEnumeration_idl__
#define __com_sun_star_sheet_SheetLinkssEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetRangesQuery.idl b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
index 623220a1df20..adae1442e915 100644
--- a/offapi/com/sun/star/sheet/SheetRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
#define __com_sun_star_sheet_SheetRangesQuery_idl__
-#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
#include <com/sun/star/sheet/XCellRangesQuery.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
#include <com/sun/star/sheet/XFormulaQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
index 64e1e240434c..36cdf79f2e9d 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_SheetSortDescriptor_idl__
#define __com_sun_star_sheet_SheetSortDescriptor_idl__
-#ifndef __com_sun_star_table_TableSortDescriptor_idl__
#include <com/sun/star/table/TableSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
index 6c0723c06d55..5a694cd93468 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_SheetSortDescriptor2_idl__
#define __com_sun_star_sheet_SheetSortDescriptor2_idl__
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
#include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Solver.idl b/offapi/com/sun/star/sheet/Solver.idl
index 25fb5ac92f41..11aad514ae5d 100644
--- a/offapi/com/sun/star/sheet/Solver.idl
+++ b/offapi/com/sun/star/sheet/Solver.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_Solver_idl__
#define __com_sun_star_sheet_Solver_idl__
-#ifndef __com_sun_star_sheet_XSolver_idl__
#include <com/sun/star/sheet/XSolver.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SolverConstraint.idl b/offapi/com/sun/star/sheet/SolverConstraint.idl
index 10d735f92a15..cff56823c253 100644
--- a/offapi/com/sun/star/sheet/SolverConstraint.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraint.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_SolverConstraint_idl__
#define __com_sun_star_sheet_SolverConstraint_idl__
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraintOperator_idl__
#include <com/sun/star/sheet/SolverConstraintOperator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl
index 0b21a050d099..4458b83ec1f3 100644
--- a/offapi/com/sun/star/sheet/Spreadsheet.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheet.idl
@@ -28,74 +28,23 @@
#ifndef __com_sun_star_sheet_Spreadsheet_idl__
#define __com_sun_star_sheet_Spreadsheet_idl__
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
#include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
#include <com/sun/star/sheet/XDataPilotTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
#include <com/sun/star/drawing/XDrawPageSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableChartsSupplier_idl__
#include <com/sun/star/table/XTableChartsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
#include <com/sun/star/sheet/XCellRangeMovement.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XPrintAreas_idl__
#include <com/sun/star/sheet/XPrintAreas.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
#include <com/sun/star/sheet/XSheetPageBreak.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOutline_idl__
#include <com/sun/star/sheet/XSheetOutline.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
#include <com/sun/star/sheet/XSheetAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
#include <com/sun/star/sheet/XSheetLinkable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Scenario_idl__
#include <com/sun/star/sheet/Scenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
#include <com/sun/star/sheet/XExternalSheetName.idl>
-#endif
-
#include <com/sun/star/util/Color.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
index 3c5ad45d7942..b3a479b9c5dc 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
@@ -28,91 +28,31 @@
#ifndef __com_sun_star_sheet_SpreadsheetDocument_idl__
#define __com_sun_star_sheet_SpreadsheetDocument_idl__
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_document_XActionLockable_idl__
#include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
#include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCalculatable_idl__
#include <com/sun/star/sheet/XCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
#include <com/sun/star/sheet/XDocumentAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidatable_idl__
#include <com/sun/star/sheet/XConsolidatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XGoalSeek_idl__
#include <com/sun/star/sheet/XGoalSeek.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalDocLinks_idl__
#include <com/sun/star/sheet/XExternalDocLinks.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index e89ae136053b..fddd8255e90a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
#define __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
#include <com/sun/star/awt/XDevice.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 75b685071eb9..29102eb10ea6 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sheet_SpreadsheetDrawPage_idl__
#define __com_sun_star_sheet_SpreadsheetDrawPage_idl__
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetView.idl b/offapi/com/sun/star/sheet/SpreadsheetView.idl
index 40ade27fedad..ea0a9e1462ae 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetView.idl
@@ -27,53 +27,18 @@
#ifndef __com_sun_star_sheet_SpreadsheetView_idl__
#define __com_sun_star_sheet_SpreadsheetView_idl__
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
#include <com/sun/star/sheet/SpreadsheetViewSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
#include <com/sun/star/sheet/SpreadsheetViewPane.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
#include <com/sun/star/sheet/XSpreadsheetView.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewSplitable_idl__
#include <com/sun/star/sheet/XViewSplitable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewFreezable_idl__
#include <com/sun/star/sheet/XViewFreezable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XRangeSelection_idl__
#include <com/sun/star/sheet/XRangeSelection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
#include <com/sun/star/sheet/XActivationBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
#include <com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
index 254601559a16..71c0796ea822 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
#define __com_sun_star_sheet_SpreadsheetViewPane_idl__
-#ifndef __com_sun_star_sheet_XViewPane_idl__
#include <com/sun/star/sheet/XViewPane.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-#ifndef __com_sun_star_view_XControlAccess_idl__
#include <com/sun/star/view/XControlAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
index de2d6c70fc8c..e9e6736cedf7 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
#define __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index c1b56ff7ffc6..208d7ac71b3a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -28,13 +28,9 @@
#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
#define __com_sun_star_sheet_SpreadsheetViewSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/Spreadsheets.idl b/offapi/com/sun/star/sheet/Spreadsheets.idl
index 0e04297f1a99..8b7b19236690 100644
--- a/offapi/com/sun/star/sheet/Spreadsheets.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheets.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_Spreadsheets_idl__
#define __com_sun_star_sheet_Spreadsheets_idl__
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
#include <com/sun/star/sheet/XCellRangesAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
index e42bb9d9d93b..306e005efa02 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
#define __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalColumn.idl b/offapi/com/sun/star/sheet/SubTotalColumn.idl
index 45ebf2b9853e..65401eee335a 100644
--- a/offapi/com/sun/star/sheet/SubTotalColumn.idl
+++ b/offapi/com/sun/star/sheet/SubTotalColumn.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#define __com_sun_star_sheet_SubTotalColumn_idl__
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
index 4fe66bd28d14..24ad58d8e0cb 100644
--- a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
@@ -28,19 +28,10 @@
#ifndef __com_sun_star_sheet_SubTotalDescriptor_idl__
#define __com_sun_star_sheet_SubTotalDescriptor_idl__
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalField.idl b/offapi/com/sun/star/sheet/SubTotalField.idl
index bbec0c9706e8..c5dfe04f2b98 100644
--- a/offapi/com/sun/star/sheet/SubTotalField.idl
+++ b/offapi/com/sun/star/sheet/SubTotalField.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalField_idl__
#define __com_sun_star_sheet_SubTotalField_idl__
-#ifndef __com_sun_star_sheet_XSubTotalField_idl__
#include <com/sun/star/sheet/XSubTotalField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
index 49d6523a9d93..1f57de84cc97 100644
--- a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
#define __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormat.idl b/offapi/com/sun/star/sheet/TableAutoFormat.idl
index 8f9af3b41ef7..90e11602b7f2 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormat.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormat.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_TableAutoFormat_idl__
#define __com_sun_star_sheet_TableAutoFormat_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
index 636ca5d6e856..fe72e1ca2990 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
#define __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index 4ed00ff60374..9e172bde844b 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -28,41 +28,15 @@
#ifndef __com_sun_star_sheet_TableAutoFormatField_idl__
#define __com_sun_star_sheet_TableAutoFormatField_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
#include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
#include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
#include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
#include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
#include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
#include <com/sun/star/table/TableBorder.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormats.idl b/offapi/com/sun/star/sheet/TableAutoFormats.idl
index bffc1cdccbb2..5099c2d590ea 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormats.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormats.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sheet_TableAutoFormats_idl__
#define __com_sun_star_sheet_TableAutoFormats_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
index 3d7b19ed411c..035144825ddf 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
#define __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableCellStyle.idl b/offapi/com/sun/star/sheet/TableCellStyle.idl
index 94559721145a..4273637f6ff5 100644
--- a/offapi/com/sun/star/sheet/TableCellStyle.idl
+++ b/offapi/com/sun/star/sheet/TableCellStyle.idl
@@ -28,29 +28,12 @@
#ifndef __com_sun_star_sheet_TableCellStyle_idl__
#define __com_sun_star_sheet_TableCellStyle_idl__
-#ifndef __com_sun_star_table_CellProperties_idl__
#include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CellStyle_idl__
#include <com/sun/star/style/CellStyle.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntry.idl b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
index d0a10cd8f4fc..9888a9dd2753 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_TableConditionalEntry_idl__
#define __com_sun_star_sheet_TableConditionalEntry_idl__
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
#include <com/sun/star/sheet/XSheetConditionalEntry.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
index 815563a4aa93..2100a715a1c9 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
#define __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableConditionalFormat.idl b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
index 4c21a61ce712..4780e1424c42 100644
--- a/offapi/com/sun/star/sheet/TableConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_TableConditionalFormat_idl__
#define __com_sun_star_sheet_TableConditionalFormat_idl__
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TablePageStyle.idl b/offapi/com/sun/star/sheet/TablePageStyle.idl
index 686fb113d62c..8e3ae763bcb8 100644
--- a/offapi/com/sun/star/sheet/TablePageStyle.idl
+++ b/offapi/com/sun/star/sheet/TablePageStyle.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_TablePageStyle_idl__
#define __com_sun_star_sheet_TablePageStyle_idl__
-#ifndef __com_sun_star_style_PageStyle_idl__
#include <com/sun/star/style/PageStyle.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/TableValidation.idl b/offapi/com/sun/star/sheet/TableValidation.idl
index f71ab2b1e6aa..09e866fab371 100644
--- a/offapi/com/sun/star/sheet/TableValidation.idl
+++ b/offapi/com/sun/star/sheet/TableValidation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_TableValidation_idl__
#define __com_sun_star_sheet_TableValidation_idl__
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationType_idl__
#include <com/sun/star/sheet/ValidationType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationAlertStyle_idl__
#include <com/sun/star/sheet/ValidationAlertStyle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
index d8edb544e2d9..43a19c3bd4d1 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_UniqueCellFormatRanges_idl__
#define __com_sun_star_sheet_UniqueCellFormatRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
index ebfda93bf203..181a9b654e21 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
#define __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/VolatileResult.idl b/offapi/com/sun/star/sheet/VolatileResult.idl
index f6dafdb9c356..ebadf4b0ffba 100644
--- a/offapi/com/sun/star/sheet/VolatileResult.idl
+++ b/offapi/com/sun/star/sheet/VolatileResult.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_VolatileResult_idl__
#define __com_sun_star_sheet_VolatileResult_idl__
-#ifndef __com_sun_star_sheet_XVolatileResult_idl__
#include <com/sun/star/sheet/XVolatileResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
index e49a97e21d33..dad59c19f2a1 100644
--- a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
#define __com_sun_star_sheet_XActivationBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
#include <com/sun/star/sheet/XActivationEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationEventListener.idl b/offapi/com/sun/star/sheet/XActivationEventListener.idl
index f5478f8e07c7..42537aa2ce09 100644
--- a/offapi/com/sun/star/sheet/XActivationEventListener.idl
+++ b/offapi/com/sun/star/sheet/XActivationEventListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
#define __com_sun_star_sheet_XActivationEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ActivationEvent_idl__
#include <com/sun/star/sheet/ActivationEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAddIn.idl b/offapi/com/sun/star/sheet/XAddIn.idl
index f506de2e5587..fc7ef5b167d9 100644
--- a/offapi/com/sun/star/sheet/XAddIn.idl
+++ b/offapi/com/sun/star/sheet/XAddIn.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XAddIn_idl__
#define __com_sun_star_sheet_XAddIn_idl__
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAreaLink.idl b/offapi/com/sun/star/sheet/XAreaLink.idl
index 9d92564945c0..097c9ca786fc 100644
--- a/offapi/com/sun/star/sheet/XAreaLink.idl
+++ b/offapi/com/sun/star/sheet/XAreaLink.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XAreaLink_idl__
#define __com_sun_star_sheet_XAreaLink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAreaLinks.idl b/offapi/com/sun/star/sheet/XAreaLinks.idl
index aca3f2ac57ed..4a66e3e883b8 100644
--- a/offapi/com/sun/star/sheet/XAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/XAreaLinks.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XAreaLinks_idl__
#define __com_sun_star_sheet_XAreaLinks_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
index 6941b8c5808d..8e5bce814cff 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
#define __com_sun_star_sheet_XArrayFormulaRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
index 6761606bc4dd..fe3e4e4a0506 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XArrayFormulaTokens_idl__
#define __com_sun_star_sheet_XArrayFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCalculatable.idl b/offapi/com/sun/star/sheet/XCalculatable.idl
index 4c46f8b5829a..82546ba41ec8 100644
--- a/offapi/com/sun/star/sheet/XCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XCalculatable.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCalculatable_idl__
#define __com_sun_star_sheet_XCalculatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellAddressable.idl b/offapi/com/sun/star/sheet/XCellAddressable.idl
index b057301da9fd..8b7a2ac3820f 100644
--- a/offapi/com/sun/star/sheet/XCellAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellAddressable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellAddressable_idl__
#define __com_sun_star_sheet_XCellAddressable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
index f2c660513fdd..4325aa901053 100644
--- a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
#define __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
index f0391fafd856..f2287d3954c9 100644
--- a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
#define __com_sun_star_sheet_XCellRangeAddressable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeData.idl b/offapi/com/sun/star/sheet/XCellRangeData.idl
index 3e08587a3aa3..4931573da986 100644
--- a/offapi/com/sun/star/sheet/XCellRangeData.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeData.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XCellRangeData_idl__
#define __com_sun_star_sheet_XCellRangeData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sheet {
diff --git a/offapi/com/sun/star/sheet/XCellRangeFormula.idl b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
index 3de2eba0ddde..96e590477433 100644
--- a/offapi/com/sun/star/sheet/XCellRangeFormula.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
#define __com_sun_star_sheet_XCellRangeFormula_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeMovement.idl b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
index 230c3606b845..1362c94f4f3e 100644
--- a/offapi/com/sun/star/sheet/XCellRangeMovement.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
#define __com_sun_star_sheet_XCellRangeMovement_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
#include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellDeleteMode_idl__
#include <com/sun/star/sheet/CellDeleteMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
index 95ba302b90fe..cc8a27081641 100644
--- a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
#define __com_sun_star_sheet_XCellRangeReferrer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangesAccess.idl b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
index d22d2a4c6e6e..c82dfd7d521c 100644
--- a/offapi/com/sun/star/sheet/XCellRangesAccess.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
#define __com_sun_star_sheet_XCellRangesAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index 44c9b8b4053b..0a772c707d35 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
#define __com_sun_star_sheet_XCellRangesQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCellSeries.idl b/offapi/com/sun/star/sheet/XCellSeries.idl
index 27e6794b6eec..489b0bd8c613 100644
--- a/offapi/com/sun/star/sheet/XCellSeries.idl
+++ b/offapi/com/sun/star/sheet/XCellSeries.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XCellSeries_idl__
#define __com_sun_star_sheet_XCellSeries_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDirection_idl__
#include <com/sun/star/sheet/FillDirection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillMode_idl__
#include <com/sun/star/sheet/FillMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDateMode_idl__
#include <com/sun/star/sheet/FillDateMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
index 28170f8eadc8..e7a6ae15fad2 100644
--- a/offapi/com/sun/star/sheet/XCompatibilityNames.idl
+++ b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
#define __com_sun_star_sheet_XCompatibilityNames_idl__
-#ifndef __com_sun_star_sheet_LocalizedName_idl__
#include <com/sun/star/sheet/LocalizedName.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XConsolidatable.idl b/offapi/com/sun/star/sheet/XConsolidatable.idl
index ba02e0741480..8d8b7426f768 100644
--- a/offapi/com/sun/star/sheet/XConsolidatable.idl
+++ b/offapi/com/sun/star/sheet/XConsolidatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XConsolidatable_idl__
#define __com_sun_star_sheet_XConsolidatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
index e23069c57a84..25d981b81f70 100644
--- a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
#define __com_sun_star_sheet_XConsolidationDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELink.idl b/offapi/com/sun/star/sheet/XDDELink.idl
index 3f2a71ed4cbd..b23bbd6ad6ce 100644
--- a/offapi/com/sun/star/sheet/XDDELink.idl
+++ b/offapi/com/sun/star/sheet/XDDELink.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDDELink_idl__
#define __com_sun_star_sheet_XDDELink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELinkResults.idl b/offapi/com/sun/star/sheet/XDDELinkResults.idl
index b0ca1afd5205..aaab7f4f83bf 100644
--- a/offapi/com/sun/star/sheet/XDDELinkResults.idl
+++ b/offapi/com/sun/star/sheet/XDDELinkResults.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
#define __com_sun_star_sheet_XDDELinkResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDDELinks.idl b/offapi/com/sun/star/sheet/XDDELinks.idl
index 6863a4432c8c..59c9cccb7e03 100644
--- a/offapi/com/sun/star/sheet/XDDELinks.idl
+++ b/offapi/com/sun/star/sheet/XDDELinks.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDDELinks_idl__
#define __com_sun_star_sheet_XDDELinks_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
#include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DDELinkMode_idl__
#include <com/sun/star/sheet/DDELinkMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
index 06d74a921077..26fa3f7dc2fe 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
#define __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
index ab86bf29e05a..e3466071c838 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#define __com_sun_star_sheet_XDataPilotDescriptor_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotField.idl b/offapi/com/sun/star/sheet/XDataPilotField.idl
index 43f98d55f029..a56745f98179 100644
--- a/offapi/com/sun/star/sheet/XDataPilotField.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotField_idl__
#define __com_sun_star_sheet_XDataPilotField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index 23e5f8a8dc35..3da01a1b4d59 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
#define __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
index b8f51d27cfcd..d9701b077d9a 100644
--- a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
#define __com_sun_star_sheet_XDataPilotMemberResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_MemberResult_idl__
#include <com/sun/star/sheet/MemberResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotResults.idl b/offapi/com/sun/star/sheet/XDataPilotResults.idl
index 38e4c2ec6886..ec6950670d17 100644
--- a/offapi/com/sun/star/sheet/XDataPilotResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotResults.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
#define __com_sun_star_sheet_XDataPilotResults_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataResult_idl__
#include <com/sun/star/sheet/DataResult.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable.idl b/offapi/com/sun/star/sheet/XDataPilotTable.idl
index 00aae3780bd9..2a6c4e66bb6b 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#define __com_sun_star_sheet_XDataPilotTable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable2.idl b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
index a0fbd5934e8d..ed6dde8a1426 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable2.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
@@ -28,30 +28,12 @@
#ifndef __com_sun_star_sheet_XDataPilotTable2_idl__
#define __com_sun_star_sheet_XDataPilotTable2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
#include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotOutputRangeType_idl__
#include <com/sun/star/sheet/DataPilotOutputRangeType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
#include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
#include <com/sun/star/sheet/DataPilotTablePositionData.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/sheet/XDataPilotTables.idl b/offapi/com/sun/star/sheet/XDataPilotTables.idl
index f4706cdb223c..77e4daf23043 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTables.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#define __com_sun_star_sheet_XDataPilotTables_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
index 1df209f6d669..285d03b4dbe8 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
#define __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
#include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index 9826ab8278e6..608a652112eb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
#define __com_sun_star_sheet_XDatabaseRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDatabaseRanges.idl b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
index 1794f3c7eb42..b986915a71cb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
#define __com_sun_star_sheet_XDatabaseRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
index 309fdee4c522..50576e87d039 100644
--- a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
#define __com_sun_star_sheet_XDimensionsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDocumentAuditing.idl b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
index 25a82ffb6970..da8da2723005 100644
--- a/offapi/com/sun/star/sheet/XDocumentAuditing.idl
+++ b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
#define __com_sun_star_sheet_XDocumentAuditing_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index b0cb6e212050..58b7ff5c9d48 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XDrillDownDataSupplier_idl__
#define __com_sun_star_sheet_XDrillDownDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
#include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
index 16de0542a669..809b05371ea2 100644
--- a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
#define __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
#include <com/sun/star/awt/XEnhancedMouseClickHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XExternalSheetName.idl b/offapi/com/sun/star/sheet/XExternalSheetName.idl
index dd0cc73c67ec..eb5d3f692a99 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetName.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetName.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
#define __com_sun_star_sheet_XExternalSheetName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
index b00ccb8158c6..0d416d6f1190 100644
--- a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
+++ b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XFillAcrossSheet_idl__
#define __com_sun_star_sheet_XFillAcrossSheet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index b20fdf4e2889..9f3db26ad8ad 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
#define __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
#include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaQuery.idl b/offapi/com/sun/star/sheet/XFormulaQuery.idl
index 3c5ca0b0eb23..9b4dd11976a9 100644
--- a/offapi/com/sun/star/sheet/XFormulaQuery.idl
+++ b/offapi/com/sun/star/sheet/XFormulaQuery.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
#define __com_sun_star_sheet_XFormulaQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 5edfe0b9840d..cc2d42c17091 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XFormulaTokens_idl__
#define __com_sun_star_sheet_XFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFunctionAccess.idl b/offapi/com/sun/star/sheet/XFunctionAccess.idl
index c12401421b35..a5ce77a21e22 100644
--- a/offapi/com/sun/star/sheet/XFunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/XFunctionAccess.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
#define __com_sun_star_sheet_XFunctionAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
index 6346de137820..944a512cdc07 100644
--- a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
#define __com_sun_star_sheet_XFunctionDescriptions_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XGoalSeek.idl b/offapi/com/sun/star/sheet/XGoalSeek.idl
index a6e627574f88..cbe74b24d9d2 100644
--- a/offapi/com/sun/star/sheet/XGoalSeek.idl
+++ b/offapi/com/sun/star/sheet/XGoalSeek.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XGoalSeek_idl__
#define __com_sun_star_sheet_XGoalSeek_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GoalResult_idl__
#include <com/sun/star/sheet/GoalResult.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
index 6b491fadabf0..61a66d169852 100644
--- a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
#define __com_sun_star_sheet_XHeaderFooterContent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
index 8b96a2888a04..9695363931c7 100644
--- a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
#define __com_sun_star_sheet_XHierarchiesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLabelRange.idl b/offapi/com/sun/star/sheet/XLabelRange.idl
index 0fc837e8d244..b12a4cb078b4 100644
--- a/offapi/com/sun/star/sheet/XLabelRange.idl
+++ b/offapi/com/sun/star/sheet/XLabelRange.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLabelRange_idl__
#define __com_sun_star_sheet_XLabelRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLabelRanges.idl b/offapi/com/sun/star/sheet/XLabelRanges.idl
index b1cf0aaeac09..a33d75cf9b36 100644
--- a/offapi/com/sun/star/sheet/XLabelRanges.idl
+++ b/offapi/com/sun/star/sheet/XLabelRanges.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLabelRanges_idl__
#define __com_sun_star_sheet_XLabelRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XLevelsSupplier.idl b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
index ec867a5ecf94..e0941d2cbe5c 100644
--- a/offapi/com/sun/star/sheet/XLevelsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
#define __com_sun_star_sheet_XLevelsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMembersSupplier.idl b/offapi/com/sun/star/sheet/XMembersSupplier.idl
index 44c9669bc247..5bd7dde0f01e 100644
--- a/offapi/com/sun/star/sheet/XMembersSupplier.idl
+++ b/offapi/com/sun/star/sheet/XMembersSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
#define __com_sun_star_sheet_XMembersSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index eb6ade5c3883..7cf55b7b1f15 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XMultiFormulaTokens_idl__
#define __com_sun_star_sheet_XMultiFormulaTokens_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
#include <com/sun/star/sheet/FormulaToken.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XMultipleOperation.idl b/offapi/com/sun/star/sheet/XMultipleOperation.idl
index c0ba09d28674..550f0d41ac89 100644
--- a/offapi/com/sun/star/sheet/XMultipleOperation.idl
+++ b/offapi/com/sun/star/sheet/XMultipleOperation.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
#define __com_sun_star_sheet_XMultipleOperation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableOperationMode_idl__
#include <com/sun/star/sheet/TableOperationMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XNamedRange.idl b/offapi/com/sun/star/sheet/XNamedRange.idl
index 678594c41d15..34312e316e3e 100644
--- a/offapi/com/sun/star/sheet/XNamedRange.idl
+++ b/offapi/com/sun/star/sheet/XNamedRange.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XNamedRange_idl__
#define __com_sun_star_sheet_XNamedRange_idl__
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XNamedRanges.idl b/offapi/com/sun/star/sheet/XNamedRanges.idl
index 36fb40485ce6..a1919ed7f32c 100644
--- a/offapi/com/sun/star/sheet/XNamedRanges.idl
+++ b/offapi/com/sun/star/sheet/XNamedRanges.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sheet_XNamedRanges_idl__
#define __com_sun_star_sheet_XNamedRanges_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Border_idl__
#include <com/sun/star/sheet/Border.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XPrintAreas.idl b/offapi/com/sun/star/sheet/XPrintAreas.idl
index 77078c687955..d0008b9c4139 100644
--- a/offapi/com/sun/star/sheet/XPrintAreas.idl
+++ b/offapi/com/sun/star/sheet/XPrintAreas.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XPrintAreas_idl__
#define __com_sun_star_sheet_XPrintAreas_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelection.idl b/offapi/com/sun/star/sheet/XRangeSelection.idl
index e5a43d211a15..b1cda9c73961 100644
--- a/offapi/com/sun/star/sheet/XRangeSelection.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelection_idl__
#define __com_sun_star_sheet_XRangeSelection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
index b67d55f72728..6c9a99403ce4 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
#define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
index 41e9755127e2..7b1072bb591b 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__
#define __com_sun_star_sheet_XRangeSelectionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
#include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRecentFunctions.idl b/offapi/com/sun/star/sheet/XRecentFunctions.idl
index 91a3436f9bb9..40b7c91bff81 100644
--- a/offapi/com/sun/star/sheet/XRecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/XRecentFunctions.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
#define __com_sun_star_sheet_XRecentFunctions_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XResultListener.idl b/offapi/com/sun/star/sheet/XResultListener.idl
index 7f72f0fd0a35..5c80e01cf28d 100644
--- a/offapi/com/sun/star/sheet/XResultListener.idl
+++ b/offapi/com/sun/star/sheet/XResultListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XResultListener_idl__
#define __com_sun_star_sheet_XResultListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ResultEvent_idl__
#include <com/sun/star/sheet/ResultEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenario.idl b/offapi/com/sun/star/sheet/XScenario.idl
index 4ff1ad532d6a..9904e3a4f830 100644
--- a/offapi/com/sun/star/sheet/XScenario.idl
+++ b/offapi/com/sun/star/sheet/XScenario.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XScenario_idl__
#define __com_sun_star_sheet_XScenario_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
index e61f6103e3b9..c2d3e850699c 100644
--- a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
+++ b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
#define __com_sun_star_sheet_XScenarioEnhanced_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarios.idl b/offapi/com/sun/star/sheet/XScenarios.idl
index d294bdf72b42..c2318fde074d 100644
--- a/offapi/com/sun/star/sheet/XScenarios.idl
+++ b/offapi/com/sun/star/sheet/XScenarios.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XScenarios_idl__
#define __com_sun_star_sheet_XScenarios_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenariosSupplier.idl b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
index f04770fe08aa..6187a03b7505 100644
--- a/offapi/com/sun/star/sheet/XScenariosSupplier.idl
+++ b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
#define __com_sun_star_sheet_XScenariosSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarios_idl__
#include <com/sun/star/sheet/XScenarios.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotation.idl b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
index a999cf8f32b8..08dcf3473150 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotation.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#define __com_sun_star_sheet_XSheetAnnotation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
index e53477080bea..580988fbf6a2 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
#define __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
#include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
index 5075cc2f52b4..17c634af3802 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
#define __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotations.idl b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
index d4af276060f4..5dd306679398 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotations.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#define __com_sun_star_sheet_XSheetAnnotations_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
index 9b696060a977..d565c651ad77 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
#define __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
#include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetAuditing.idl b/offapi/com/sun/star/sheet/XSheetAuditing.idl
index 43342f5a6f6b..27b22679292b 100644
--- a/offapi/com/sun/star/sheet/XSheetAuditing.idl
+++ b/offapi/com/sun/star/sheet/XSheetAuditing.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
#define __com_sun_star_sheet_XSheetAuditing_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellCursor.idl b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
index 3141231437cd..9be7548ed8b7 100644
--- a/offapi/com/sun/star/sheet/XSheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
#define __com_sun_star_sheet_XSheetCellCursor_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRange.idl b/offapi/com/sun/star/sheet/XSheetCellRange.idl
index f025a44e3e25..adb62b1f720a 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#define __com_sun_star_sheet_XSheetCellRange_idl__
-#ifndef __com_sun_star_table_XCellRange_idl__
#include <com/sun/star/table/XCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
index b063b2ed3f95..c0f3bcf9cc84 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
#define __com_sun_star_sheet_XSheetCellRangeContainer_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCellRanges.idl b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
index 7b87269d779f..9f283dc0678d 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
#define __com_sun_star_sheet_XSheetCellRanges_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCondition.idl b/offapi/com/sun/star/sheet/XSheetCondition.idl
index 3fc4635f9b4a..46aef18e092c 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#define __com_sun_star_sheet_XSheetCondition_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator_idl__
#include <com/sun/star/sheet/ConditionOperator.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetCondition2.idl b/offapi/com/sun/star/sheet/XSheetCondition2.idl
index 3c78f16e57c7..d03a79f0c964 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition2.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition2.idl
@@ -29,21 +29,10 @@
#ifndef __com_sun_star_sheet_XSheetCondition2_idl__
#define __com_sun_star_sheet_XSheetCondition2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator2_idl__
#include <com/sun/star/sheet/ConditionOperator2.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
#include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
index 8e8b10af5e14..c12b6a80b0a7 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
#define __com_sun_star_sheet_XSheetConditionalEntries_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
index 2ecc635393b6..e09afd1fe85b 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
#define __com_sun_star_sheet_XSheetConditionalEntry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index b40437ec0fac..676e263501e8 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
#define __com_sun_star_sheet_XSheetFilterable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
index 591e9b18ed72..5df55bb8ed1f 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
#define __com_sun_star_sheet_XSheetFilterableEx_idl__
-#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
#include <com/sun/star/sheet/XSheetFilterable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetLinkable.idl b/offapi/com/sun/star/sheet/XSheetLinkable.idl
index 159176dce9d3..f13d34e2281a 100644
--- a/offapi/com/sun/star/sheet/XSheetLinkable.idl
+++ b/offapi/com/sun/star/sheet/XSheetLinkable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
#define __com_sun_star_sheet_XSheetLinkable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetLinkMode_idl__
#include <com/sun/star/sheet/SheetLinkMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetOperation.idl b/offapi/com/sun/star/sheet/XSheetOperation.idl
index a547cfa66e91..32a8f1f86868 100644
--- a/offapi/com/sun/star/sheet/XSheetOperation.idl
+++ b/offapi/com/sun/star/sheet/XSheetOperation.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetOperation_idl__
#define __com_sun_star_sheet_XSheetOperation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
#include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetOutline.idl b/offapi/com/sun/star/sheet/XSheetOutline.idl
index 0f3de869d980..85466ed15180 100644
--- a/offapi/com/sun/star/sheet/XSheetOutline.idl
+++ b/offapi/com/sun/star/sheet/XSheetOutline.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sheet_XSheetOutline_idl__
#define __com_sun_star_sheet_XSheetOutline_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
#include <com/sun/star/table/TableOrientation.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetPageBreak.idl b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
index 7d590f18eac0..f948cdbb541e 100644
--- a/offapi/com/sun/star/sheet/XSheetPageBreak.idl
+++ b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
#define __com_sun_star_sheet_XSheetPageBreak_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TablePageBreakData_idl__
#include <com/sun/star/sheet/TablePageBreakData.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetPastable.idl b/offapi/com/sun/star/sheet/XSheetPastable.idl
index db2053f83273..3b0c6b812cae 100644
--- a/offapi/com/sun/star/sheet/XSheetPastable.idl
+++ b/offapi/com/sun/star/sheet/XSheetPastable.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_sheet_XSheetPastable_idl__
#define __com_sun_star_sheet_XSheetPastable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
#include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_PasteOperation_idl__
#include <com/sun/star/sheet/PasteOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
#include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSolver.idl b/offapi/com/sun/star/sheet/XSolver.idl
index aaf54ddb7586..26a28e40fcae 100644
--- a/offapi/com/sun/star/sheet/XSolver.idl
+++ b/offapi/com/sun/star/sheet/XSolver.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSolver_idl__
#define __com_sun_star_sheet_XSolver_idl__
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraint_idl__
#include <com/sun/star/sheet/SolverConstraint.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSolverDescription.idl b/offapi/com/sun/star/sheet/XSolverDescription.idl
index 0efe1e202e94..808a6d6f0bda 100644
--- a/offapi/com/sun/star/sheet/XSolverDescription.idl
+++ b/offapi/com/sun/star/sheet/XSolverDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSolverDescription_idl__
#define __com_sun_star_sheet_XSolverDescription_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheet.idl b/offapi/com/sun/star/sheet/XSpreadsheet.idl
index 3f7628ad5a4a..10b35b31d6f6 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheet.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#define __com_sun_star_sheet_XSpreadsheet_idl__
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
#include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
index a60248d22b75..8b49166999ed 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
#define __com_sun_star_sheet_XSpreadsheetDocument_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetView.idl b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
index baefdb2359c7..92926e9e1f4c 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
#define __com_sun_star_sheet_XSpreadsheetView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets.idl b/offapi/com/sun/star/sheet/XSpreadsheets.idl
index f50157768667..293dd45ffb15 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
#define __com_sun_star_sheet_XSpreadsheets_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
index c1c1524a14a5..4ca801521920 100644
--- a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
#define __com_sun_star_sheet_XSubTotalCalculatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
index 2a2d0afe1293..469083172320 100644
--- a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
#define __com_sun_star_sheet_XSubTotalDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSubTotalField.idl b/offapi/com/sun/star/sheet/XSubTotalField.idl
index 3af87e72df3c..5b12e0944358 100644
--- a/offapi/com/sun/star/sheet/XSubTotalField.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSubTotalField_idl__
#define __com_sun_star_sheet_XSubTotalField_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
#include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
index 73e758af6539..39d3e08bd522 100644
--- a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
#define __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
index 528b55c07a5c..4d7cf0c1de8c 100644
--- a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
+++ b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
#define __com_sun_star_sheet_XUsedAreaCursor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewFreezable.idl b/offapi/com/sun/star/sheet/XViewFreezable.idl
index 46464036e704..ffa8a0249435 100644
--- a/offapi/com/sun/star/sheet/XViewFreezable.idl
+++ b/offapi/com/sun/star/sheet/XViewFreezable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XViewFreezable_idl__
#define __com_sun_star_sheet_XViewFreezable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPane.idl b/offapi/com/sun/star/sheet/XViewPane.idl
index 41f441e6a803..46a115fe7f5c 100644
--- a/offapi/com/sun/star/sheet/XViewPane.idl
+++ b/offapi/com/sun/star/sheet/XViewPane.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sheet_XViewPane_idl__
#define __com_sun_star_sheet_XViewPane_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
index 130498695c6e..79e99faeb42c 100644
--- a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XViewPanesSupplier_idl__
#define __com_sun_star_sheet_XViewPanesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewSplitable.idl b/offapi/com/sun/star/sheet/XViewSplitable.idl
index d5145addb9ee..0b0d1aa073d4 100644
--- a/offapi/com/sun/star/sheet/XViewSplitable.idl
+++ b/offapi/com/sun/star/sheet/XViewSplitable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sheet_XViewSplitable_idl__
#define __com_sun_star_sheet_XViewSplitable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/XVolatileResult.idl b/offapi/com/sun/star/sheet/XVolatileResult.idl
index 9378e09472f0..665e546367d5 100644
--- a/offapi/com/sun/star/sheet/XVolatileResult.idl
+++ b/offapi/com/sun/star/sheet/XVolatileResult.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XVolatileResult_idl__
#define __com_sun_star_sheet_XVolatileResult_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XResultListener_idl__
#include <com/sun/star/sheet/XResultListener.idl>
-#endif
//=============================================================================