Strip include guards in idl files

37 files changed, 0 insertions, 258 deletions

diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index 5db7acb3d2a6..bcf5072c0a4f 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_CheckBox_idl__
 #define __com_sun_star_form_component_CheckBox_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 #include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c5d02077cad8..7b3155703838 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ComboBox_idl__
 #define __com_sun_star_form_component_ComboBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
 #include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 1e190f2ae1ca..163f6375d96c 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_CurrencyField_idl__
 #define __com_sun_star_form_component_CurrencyField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
 #include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index 1a17ae0525e1..e52dcc9b418e 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_form_component_DataForm_idl__
 #define __com_sun_star_form_component_DataForm_idl__
 
-#ifndef __com_sun_star_form_component_Form_idl__
 #include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
 #include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
 #include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
 #include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
 #include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
 #include <com/sun/star/awt/TabControllerModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index 82f49ad55d02..508195af437f 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
 #define __com_sun_star_form_component_DatabaseCheckBox_idl__
 
-#ifndef __com_sun_star_form_component_CheckBox_idl__
 #include <com/sun/star/form/component/CheckBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 7a921f004093..e5f2c8b3edd0 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
 #define __com_sun_star_form_component_DatabaseComboBox_idl__
 
-#ifndef __com_sun_star_form_component_ComboBox_idl__
 #include <com/sun/star/form/component/ComboBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_ListSourceType_idl__
 #include <com/sun/star/form/ListSourceType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index 3d56099c31d7..7421d716ff24 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
 #define __com_sun_star_form_component_DatabaseCurrencyField_idl__
 
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
 #include <com/sun/star/form/component/CurrencyField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 8673636874b0..b4ff715315cc 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseDateField_idl__
 #define __com_sun_star_form_component_DatabaseDateField_idl__
 
-#ifndef __com_sun_star_form_component_DateField_idl__
 #include <com/sun/star/form/component/DateField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 575ad5d8ff02..9b402401eb52 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
 #define __com_sun_star_form_component_DatabaseFormattedField_idl__
 
-#ifndef __com_sun_star_form_component_FormattedField_idl__
 #include <com/sun/star/form/component/FormattedField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index 731a27437bf5..6325517fff61 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
 #define __com_sun_star_form_component_DatabaseImageControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index dbd96f31e985..a93fe0c9032e 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseListBox_idl__
 #define __com_sun_star_form_component_DatabaseListBox_idl__
 
-#ifndef __com_sun_star_form_component_ListBox_idl__
 #include <com/sun/star/form/component/ListBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_ListSourceType_idl__
 #include <com/sun/star/form/ListSourceType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index 57853d6ddc83..8f138d7f2ee0 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
 #define __com_sun_star_form_component_DatabaseNumericField_idl__
 
-#ifndef __com_sun_star_form_component_NumericField_idl__
 #include <com/sun/star/form/component/NumericField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index 2488b4160cad..04b11ccb0f09 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabasePatternField_idl__
 #define __com_sun_star_form_component_DatabasePatternField_idl__
 
-#ifndef __com_sun_star_form_component_PatternField_idl__
 #include <com/sun/star/form/component/PatternField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index 2b60c3fb5dd3..982119f1a080 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
 #define __com_sun_star_form_component_DatabaseRadioButton_idl__
 
-#ifndef __com_sun_star_form_component_RadioButton_idl__
 #include <com/sun/star/form/component/RadioButton.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 001f342d3c53..036deac327df 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTextField_idl__
 #define __com_sun_star_form_component_DatabaseTextField_idl__
 
-#ifndef __com_sun_star_form_component_TextField_idl__
 #include <com/sun/star/form/component/TextField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 1ac3d51ccc36..0bd5ecf0ec31 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
 #define __com_sun_star_form_component_DatabaseTimeField_idl__
 
-#ifndef __com_sun_star_form_component_TimeField_idl__
 #include <com/sun/star/form/component/TimeField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index b7764c8ea874..dca52c109763 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DateField_idl__
 #define __com_sun_star_form_component_DateField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
 #include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index d9956c7114b6..c5006ac6880f 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FileControl_idl__
 #define __com_sun_star_form_component_FileControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
 #include <com/sun/star/awt/UnoControlFileControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 1bb60c47388e..84a796d9f46d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_FixedText_idl__
 #define __com_sun_star_form_component_FixedText_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
 #include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 526a2febecb0..c72e5b4a42a8 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_form_component_Form_idl__
 #define __com_sun_star_form_component_Form_idl__
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
 #include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index 99ea2c4cd3d3..08ec5b9767eb 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FormattedField_idl__
 #define __com_sun_star_form_component_FormattedField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 #include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index d5e61c377b69..925a8ed992dc 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
 #ifndef __com_sun_star_form_component_GridControl_idl__
 #define __com_sun_star_form_component_GridControl_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
 #include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index d4f2b57375ae..6d9fcfff51fe 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_GroupBox_idl__
 #define __com_sun_star_form_component_GroupBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
 #include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 763f388a4185..95f725713f26 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_HTMLForm_idl__
 #define __com_sun_star_form_component_HTMLForm_idl__
 
-#ifndef __com_sun_star_form_component_Form_idl__
 #include <com/sun/star/form/component/Form.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
-#ifndef __com_sun_star_form_XSubmit_idl__
 #include <com/sun/star/form/XSubmit.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
 #include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
 #include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index cf516df86d12..9b758b4e6dfd 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_component_HiddenControl_idl__
 #define __com_sun_star_form_component_HiddenControl_idl__
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 69df0e295106..8f789ef56200 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_ImageButton_idl__
 #define __com_sun_star_form_component_ImageButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
 #include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
 
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormButtonType_idl__
 #include <com/sun/star/form/FormButtonType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index f636d25b77ee..d1a4fc4537e2 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ListBox_idl__
 #define __com_sun_star_form_component_ListBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
 #include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index 762782827cf9..2be8ff59cc36 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_form_component_NavigationToolBar_idl__
 #define __com_sun_star_form_component_NavigationToolBar_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index 62336316eb0a..9abf804f964d 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_NumericField_idl__
 #define __com_sun_star_form_component_NumericField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
 #include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index f41a12d2231e..22187b2749d8 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_PatternField_idl__
 #define __com_sun_star_form_component_PatternField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
 #include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 76575e3450bd..a38c86594f2f 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_RadioButton_idl__
 #define __com_sun_star_form_component_RadioButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 #include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 0566f658a197..086a8dc455bf 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_component_RichTextControl_idl__
 #define __com_sun_star_form_component_RichTextControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 69e0fc7e78ff..81248839641c 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_ScrollBar_idl__
 #define __com_sun_star_form_component_ScrollBar_idl__
 
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
 #include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 09be77ed47c3..8323ab7854fe 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SpinButton_idl__
 #define __com_sun_star_form_component_SpinButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 #include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index b540065cb989..6330c455677f 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SubmitButton_idl__
 #define __com_sun_star_form_component_SubmitButton_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
 #include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
 #include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index bb4cf5ce046c..9cc34b6c77b1 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_form_component_TextField_idl__
 #define __com_sun_star_form_component_TextField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
 #include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index 22cf529ead70..a3aee8eb856e 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_TimeField_idl__
 #define __com_sun_star_form_component_TimeField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
 #include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================