summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/form
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
commit45e7a5b78c29ebc5bd43ba65d1b02cb4457be613 (patch)
treee35eb3316b7f97bf0126b74d8816fdaabbc727e8 /offapi/com/sun/star/form
parent3ab3374ed3863c7c6e329c56aabec31d6c908656 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/form')
-rw-r--r--offapi/com/sun/star/form/DataAwareControlModel.idl10
-rw-r--r--offapi/com/sun/star/form/DatabaseDeleteEvent.idl2
-rw-r--r--offapi/com/sun/star/form/DatabaseParameterEvent.idl4
-rw-r--r--offapi/com/sun/star/form/ErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/form/FormComponent.idl12
-rw-r--r--offapi/com/sun/star/form/FormComponents.idl12
-rw-r--r--offapi/com/sun/star/form/FormControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/FormController.idl26
-rw-r--r--offapi/com/sun/star/form/FormControllerDispatcher.idl2
-rw-r--r--offapi/com/sun/star/form/Forms.idl11
-rw-r--r--offapi/com/sun/star/form/PropertyBrowserController.idl11
-rw-r--r--offapi/com/sun/star/form/XApproveActionBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XApproveActionListener.idl4
-rw-r--r--offapi/com/sun/star/form/XBoundComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XBoundControl.idl2
-rw-r--r--offapi/com/sun/star/form/XChangeBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XChangeListener.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl2
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorListener.idl4
-rw-r--r--offapi/com/sun/star/form/XForm.idl2
-rw-r--r--offapi/com/sun/star/form/XFormComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XFormController.idl6
-rw-r--r--offapi/com/sun/star/form/XFormControllerListener.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier2.idl2
-rw-r--r--offapi/com/sun/star/form/XGrid.idl2
-rw-r--r--offapi/com/sun/star/form/XGridColumnFactory.idl6
-rw-r--r--offapi/com/sun/star/form/XGridFieldDataSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XGridPeer.idl4
-rw-r--r--offapi/com/sun/star/form/XImageProducerSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XInsertListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadable.idl4
-rw-r--r--offapi/com/sun/star/form/XPositioningListener.idl4
-rw-r--r--offapi/com/sun/star/form/XReset.idl4
-rw-r--r--offapi/com/sun/star/form/XResetListener.idl4
-rw-r--r--offapi/com/sun/star/form/XRestoreListener.idl4
-rw-r--r--offapi/com/sun/star/form/XSubmit.idl8
-rw-r--r--offapi/com/sun/star/form/XSubmitListener.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableControlModel.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl2
-rw-r--r--offapi/com/sun/star/form/binding/IncompatibleTypesException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/InvalidBindingStateException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntryEvent.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/ValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/binding/XBindableValue.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntryListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySink.idl2
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/XValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/component/CheckBox.idl8
-rw-r--r--offapi/com/sun/star/form/component/ComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/CurrencyField.idl6
-rw-r--r--offapi/com/sun/star/form/component/DataForm.idl20
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCheckBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCurrencyField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseDateField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseFormattedField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseImageControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseNumericField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabasePatternField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseRadioButton.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTextField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTimeField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DateField.idl6
-rw-r--r--offapi/com/sun/star/form/component/FileControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/FixedText.idl4
-rw-r--r--offapi/com/sun/star/form/component/Form.idl14
-rw-r--r--offapi/com/sun/star/form/component/FormattedField.idl6
-rw-r--r--offapi/com/sun/star/form/component/GridControl.idl26
-rw-r--r--offapi/com/sun/star/form/component/GroupBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/HTMLForm.idl10
-rw-r--r--offapi/com/sun/star/form/component/HiddenControl.idl2
-rw-r--r--offapi/com/sun/star/form/component/ImageButton.idl10
-rw-r--r--offapi/com/sun/star/form/component/ListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/NavigationToolBar.idl4
-rw-r--r--offapi/com/sun/star/form/component/NumericField.idl6
-rw-r--r--offapi/com/sun/star/form/component/PatternField.idl6
-rw-r--r--offapi/com/sun/star/form/component/RadioButton.idl6
-rw-r--r--offapi/com/sun/star/form/component/RichTextControl.idl8
-rw-r--r--offapi/com/sun/star/form/component/ScrollBar.idl8
-rw-r--r--offapi/com/sun/star/form/component/SpinButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/SubmitButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/TextField.idl10
-rw-r--r--offapi/com/sun/star/form/component/TimeField.idl6
-rw-r--r--offapi/com/sun/star/form/control/CheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/CommandButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/CurrencyField.idl5
-rw-r--r--offapi/com/sun/star/form/control/DateField.idl5
-rw-r--r--offapi/com/sun/star/form/control/FormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/control/GridControl.idl32
-rw-r--r--offapi/com/sun/star/form/control/GroupBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageControl.idl5
-rw-r--r--offapi/com/sun/star/form/control/InteractionGridControl.idl4
-rw-r--r--offapi/com/sun/star/form/control/ListBox.idl8
-rw-r--r--offapi/com/sun/star/form/control/NavigationToolBar.idl2
-rw-r--r--offapi/com/sun/star/form/control/NumericField.idl5
-rw-r--r--offapi/com/sun/star/form/control/PatternField.idl5
-rw-r--r--offapi/com/sun/star/form/control/RadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/SubmitButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/TextField.idl7
-rw-r--r--offapi/com/sun/star/form/control/TimeField.idl5
-rw-r--r--offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/EditPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/EventHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/FormOperations.idl8
-rw-r--r--offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/XFormOperations.idl17
-rw-r--r--offapi/com/sun/star/form/submission/XSubmission.idl10
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionSupplier.idl2
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl4
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatable.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatableFormComponent.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XValidator.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidityConstraintListener.idl2
147 files changed, 0 insertions, 820 deletions
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index 8d7be2db024f..7ca7944f6659 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#define __com_sun_star_form_DataAwareControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index adad03001091..e34bb91307cf 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__
#define __com_sun_star_form_DatabaseDeleteEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index f933f612e345..1a1c53e10b4f 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#define __com_sun_star_form_DatabaseParameterEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index b5267df0c7b5..dffba943fe0e 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_ErrorEvent_idl__
#define __com_sun_star_form_ErrorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index bb48e67df44d..56dcf480e0d5 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_form_FormComponent_idl__
#define __com_sun_star_form_FormComponent_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyBag_idl__
#include <com/sun/star/beans/PropertyBag.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index e29b162f6087..32feb2da0b2f 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -27,22 +27,10 @@
#ifndef __com_sun_star_form_FormComponents_idl__
#define __com_sun_star_form_FormComponents_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
#include <com/sun/star/script/XEventAttacherManager.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index c0cbc6051a75..e8d1ab415ffe 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_FormControlModel_idl__
#define __com_sun_star_form_FormControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f14fd5181355..ef4dd8bc1928 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -27,49 +27,23 @@
#ifndef __com_sun_star_form_FormController_idl__
#define __com_sun_star_form_FormController_idl__
-#ifndef __com_sun_star_form_XFormController_idl__
#include <com/sun/star/form/XFormController.idl>
-#endif
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#include <com/sun/star/form/XConfirmDeleteBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
#include <com/sun/star/sdb/XSQLErrorBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
#include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#include <com/sun/star/form/FormControllerDispatcher.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index e277f95c9949..652a16647472 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#define __com_sun_star_form_FormControllerDispatcher_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index 533113d4aafd..567b4336f48e 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_form_Forms_idl__
#define __com_sun_star_form_Forms_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 18650aea09cc..180c4c45d684 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_form_PropertyBrowserController_idl__
#define __com_sun_star_form_PropertyBrowserController_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index ef53896fd501..7ce0bd7f3899 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#define __com_sun_star_form_XApproveActionBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
#include <com/sun/star/form/XApproveActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index f35ef82ba509..4cd630bbef15 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionListener_idl__
#define __com_sun_star_form_XApproveActionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 8a64b441f58a..df7c209c7a6c 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundComponent_idl__
#define __com_sun_star_form_XBoundComponent_idl__
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#include <com/sun/star/form/XUpdateBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 549e091ab1b5..5831888ad8fe 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundControl_idl__
#define __com_sun_star_form_XBoundControl_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index e67f288c0433..ba74a34d8654 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#define __com_sun_star_form_XChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeListener_idl__
#include <com/sun/star/form/XChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index 341ab4090466..c09a98a47921 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeListener_idl__
#define __com_sun_star_form_XChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index bf38373c2f49..85ab19b3a09f 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#include <com/sun/star/form/XConfirmDeleteListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index b65eb95e4f07..c30fb45d41d1 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#define __com_sun_star_form_XConfirmDeleteListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index d73d1d4f9116..6644871c1c1b 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#include <com/sun/star/form/XDatabaseParameterListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 28448b136be9..acf6c8c44d1a 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 38cd22bbee3f..c673d48a1cd3 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#define __com_sun_star_form_XDatabaseParameterListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#include <com/sun/star/form/DatabaseParameterEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index 3ba5fb10a456..95e86dd12d6a 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDeleteListener_idl__
#define __com_sun_star_form_XDeleteListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 5a6ac34f031b..7f9baaa9eb90 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorBroadcaster_idl__
#define __com_sun_star_form_XErrorBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XErrorListener_idl__
#include <com/sun/star/form/XErrorListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 6deca2e9ba7c..5b5877d87504 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorListener_idl__
#define __com_sun_star_form_XErrorListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_ErrorEvent_idl__
#include <com/sun/star/form/ErrorEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index 4fc0daaf427a..2c65b6a54b43 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XForm_idl__
#define __com_sun_star_form_XForm_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index 7d32c30deef1..24fe4996c9fd 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XFormComponent_idl__
#define __com_sun_star_form_XFormComponent_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index e78de565f7ce..47835242e42d 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XFormController_idl__
#define __com_sun_star_form_XFormController_idl__
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
#include <com/sun/star/form/XFormControllerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 0efe13153c19..ec61cb3d493d 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormControllerListener_idl__
#define __com_sun_star_form_XFormControllerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 121ee9ffac8b..c342d3462ead 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormsSupplier_idl__
#define __com_sun_star_form_XFormsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 30a22e02b91c..b0ab96e52d91 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_XFormsSupplier2_idl__
#define __com_sun_star_form_XFormsSupplier2_idl__
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index f60fa5be9cee..b1aec8c904fd 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XGrid_idl__
#define __com_sun_star_form_XGrid_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 76d1b3735b9f..ae44b6a15c9d 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#define __com_sun_star_form_XGridColumnFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 96bb954036f7..7c6202a37c5f 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#define __com_sun_star_form_XGridFieldDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index 57d815caa214..08cca59f9994 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridPeer_idl__
#define __com_sun_star_form_XGridPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 74a52e8e526c..312f5c78159d 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#define __com_sun_star_form_XImageProducerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XImageProducer_idl__
#include <com/sun/star/awt/XImageProducer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index 4cdec9ee5f1b..9d107289551f 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XInsertListener_idl__
#define __com_sun_star_form_XInsertListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index 5b3caa7bd92a..101f9c26c84a 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadListener_idl__
#define __com_sun_star_form_XLoadListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 1c1abb68059c..01363e892064 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadable_idl__
#define __com_sun_star_form_XLoadable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index 610379ed7a62..653922f6a510 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XPositioningListener_idl__
#define __com_sun_star_form_XPositioningListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 9ae85bab8c93..7173c38ef66a 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XReset_idl__
#define __com_sun_star_form_XReset_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XResetListener_idl__
#include <com/sun/star/form/XResetListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index 0f86a3822b74..3806d5868283 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XResetListener_idl__
#define __com_sun_star_form_XResetListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index 9469eaa382ea..a64142113cd7 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XRestoreListener_idl__
#define __com_sun_star_form_XRestoreListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index 1772b32c1982..1511c3267bd5 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_XSubmit_idl__
#define __com_sun_star_form_XSubmit_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmitListener_idl__
#include <com/sun/star/form/XSubmitListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index 832a1a4896d1..f2396a60cff8 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XSubmitListener_idl__
#define __com_sun_star_form_XSubmitListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index cf4f20a4da69..908fcbb95b39 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#define __com_sun_star_form_XUpdateBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XUpdateListener_idl__
#include <com/sun/star/form/XUpdateListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 1d6dc15bb76a..b058369e91f3 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateListener_idl__
#define __com_sun_star_form_XUpdateListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index 8b0d1058c77b..ec889e1d12ac 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#define __com_sun_star_form_binding_BindableControlModel_idl__
-#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#include <com/sun/star/form/binding/XBindableValue.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index 684d78b3c9c4..3569a692348d 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#define __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index d7eeb255164d..8a06b3590d97 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#include <com/sun/star/form/component/DatabaseCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index 9c379190afcc..bb1dd78886ef 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#include <com/sun/star/form/component/DatabaseComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2df7988e5d40..acf6a05e8c30 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseDateField_idl__
#define __com_sun_star_form_binding_BindableDatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#include <com/sun/star/form/component/DatabaseDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index c6f433339295..b4ad3a6e85a5 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
#define __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#include <com/sun/star/form/component/DatabaseFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index d07665579638..c2ee16193a16 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseListBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#include <com/sun/star/form/component/DatabaseListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index c34acbe14ce1..e56243f40407 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
#define __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#include <com/sun/star/form/component/DatabaseNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index b22b2af24951..e8c5dd5b806d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
#define __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#include <com/sun/star/form/component/DatabaseRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 81906b7759a5..4c3d67e2db9d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTextField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#include <com/sun/star/form/component/DatabaseTextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index fafa1a06a507..8dd842d34117 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#include <com/sun/star/form/component/DatabaseTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 478c6875f717..6a27ee71b10b 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_BindableIntegerValueRange_idl__
#define __com_sun_star_form_binding_BindableIntegerValueRange_idl__
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 4f0b6551e973..066c4e030060 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#define __com_sun_star_form_binding_IncompatibleTypesException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index d25f6159e88b..30c42840f0fe 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#define __com_sun_star_form_binding_InvalidBindingStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index d5911ffec37a..dfcc76d97055 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#define __com_sun_star_form_binding_ListEntryEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index 0ac3452e2737..6bce223367c2 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
#define __com_sun_star_form_binding_ListEntrySource_idl__
-#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#include <com/sun/star/form/binding/XListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index 36bdf4ec9e03..b05192924df4 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_ValueBinding_idl__
#define __com_sun_star_form_binding_ValueBinding_idl__
-#ifndef __com_sun_star_util_XValueBinding_idl__
#include <com/sun/star/form/binding/XValueBinding.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 2d8413029323..192cd2dbecb5 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#define __com_sun_star_form_binding_XBindableValue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index b48ec45198fc..2d2d244f8f52 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XListEntryListener_idl__
#define __com_sun_star_form_binding_XListEntryListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#include <com/sun/star/form/binding/ListEntryEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index 0f2e84a8011d..8e910d6415fb 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_XListEntrySink_idl__
#define __com_sun_star_form_binding_XListEntrySink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index ea39e18875ab..242b211ee4be 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#define __com_sun_star_form_binding_XListEntrySource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 207b3ec7e7ad..4c49932f793e 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_XValueBinding_idl__
#define __com_sun_star_form_binding_XValueBinding_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#include <com/sun/star/form/binding/InvalidBindingStateException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index 5db7acb3d2a6..bcf5072c0a4f 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_CheckBox_idl__
#define __com_sun_star_form_component_CheckBox_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
#include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c5d02077cad8..7b3155703838 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ComboBox_idl__
#define __com_sun_star_form_component_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
#include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 1e190f2ae1ca..163f6375d96c 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_CurrencyField_idl__
#define __com_sun_star_form_component_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
#include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index 1a17ae0525e1..e52dcc9b418e 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_form_component_DataForm_idl__
#define __com_sun_star_form_component_DataForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
#include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
#include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
#include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
#include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
#include <com/sun/star/awt/TabControllerModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index 82f49ad55d02..508195af437f 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#define __com_sun_star_form_component_DatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_CheckBox_idl__
#include <com/sun/star/form/component/CheckBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 7a921f004093..e5f2c8b3edd0 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#define __com_sun_star_form_component_DatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_ComboBox_idl__
#include <com/sun/star/form/component/ComboBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index 3d56099c31d7..7421d716ff24 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
#define __com_sun_star_form_component_DatabaseCurrencyField_idl__
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
#include <com/sun/star/form/component/CurrencyField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 8673636874b0..b4ff715315cc 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#define __com_sun_star_form_component_DatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DateField_idl__
#include <com/sun/star/form/component/DateField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 575ad5d8ff02..9b402401eb52 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#define __com_sun_star_form_component_DatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_FormattedField_idl__
#include <com/sun/star/form/component/FormattedField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index 731a27437bf5..6325517fff61 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
#define __com_sun_star_form_component_DatabaseImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index dbd96f31e985..a93fe0c9032e 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#define __com_sun_star_form_component_DatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_ListBox_idl__
#include <com/sun/star/form/component/ListBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index 57853d6ddc83..8f138d7f2ee0 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#define __com_sun_star_form_component_DatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_NumericField_idl__
#include <com/sun/star/form/component/NumericField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index 2488b4160cad..04b11ccb0f09 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabasePatternField_idl__
#define __com_sun_star_form_component_DatabasePatternField_idl__
-#ifndef __com_sun_star_form_component_PatternField_idl__
#include <com/sun/star/form/component/PatternField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index 2b60c3fb5dd3..982119f1a080 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#define __com_sun_star_form_component_DatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_RadioButton_idl__
#include <com/sun/star/form/component/RadioButton.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 001f342d3c53..036deac327df 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#define __com_sun_star_form_component_DatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_TextField_idl__
#include <com/sun/star/form/component/TextField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 1ac3d51ccc36..0bd5ecf0ec31 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#define __com_sun_star_form_component_DatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_TimeField_idl__
#include <com/sun/star/form/component/TimeField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index b7764c8ea874..dca52c109763 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DateField_idl__
#define __com_sun_star_form_component_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
#include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index d9956c7114b6..c5006ac6880f 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FileControl_idl__
#define __com_sun_star_form_component_FileControl_idl__
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
#include <com/sun/star/awt/UnoControlFileControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 1bb60c47388e..84a796d9f46d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_FixedText_idl__
#define __com_sun_star_form_component_FixedText_idl__
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
#include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 526a2febecb0..c72e5b4a42a8 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_form_component_Form_idl__
#define __com_sun_star_form_component_Form_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index 99ea2c4cd3d3..08ec5b9767eb 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FormattedField_idl__
#define __com_sun_star_form_component_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
#include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index d5e61c377b69..925a8ed992dc 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
#ifndef __com_sun_star_form_component_GridControl_idl__
#define __com_sun_star_form_component_GridControl_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index d4f2b57375ae..6d9fcfff51fe 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_GroupBox_idl__
#define __com_sun_star_form_component_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
#include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 763f388a4185..95f725713f26 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_HTMLForm_idl__
#define __com_sun_star_form_component_HTMLForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmit_idl__
#include <com/sun/star/form/XSubmit.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
#include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
#include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index cf516df86d12..9b758b4e6dfd 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_component_HiddenControl_idl__
#define __com_sun_star_form_component_HiddenControl_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 69df0e295106..8f789ef56200 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_ImageButton_idl__
#define __com_sun_star_form_component_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
-#ifndef __com_sun_star_form_FormButtonType_idl__
#include <com/sun/star/form/FormButtonType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index f636d25b77ee..d1a4fc4537e2 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ListBox_idl__
#define __com_sun_star_form_component_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
#include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index 762782827cf9..2be8ff59cc36 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_component_NavigationToolBar_idl__
#define __com_sun_star_form_component_NavigationToolBar_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index 62336316eb0a..9abf804f964d 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_NumericField_idl__
#define __com_sun_star_form_component_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
#include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index f41a12d2231e..22187b2749d8 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_PatternField_idl__
#define __com_sun_star_form_component_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
#include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 76575e3450bd..a38c86594f2f 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_RadioButton_idl__
#define __com_sun_star_form_component_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
#include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 0566f658a197..086a8dc455bf 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_component_RichTextControl_idl__
#define __com_sun_star_form_component_RichTextControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
#include <com/sun/star/text/TextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 69e0fc7e78ff..81248839641c 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_ScrollBar_idl__
#define __com_sun_star_form_component_ScrollBar_idl__
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
#include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 09be77ed47c3..8323ab7854fe 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SpinButton_idl__
#define __com_sun_star_form_component_SpinButton_idl__
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
#include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index b540065cb989..6330c455677f 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SubmitButton_idl__
#define __com_sun_star_form_component_SubmitButton_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
#include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index bb4cf5ce046c..9cc34b6c77b1 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_form_component_TextField_idl__
#define __com_sun_star_form_component_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
#include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index 22cf529ead70..a3aee8eb856e 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_TimeField_idl__
#define __com_sun_star_form_component_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
#include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index 763e8ec9132c..0cd41a120679 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_component_checkbox_idl__
#define __com_sun_star_form_component_checkbox_idl__
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
#include <com/sun/star/awt/UnoControlCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index b4dbfac27509..de8444eb4231 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ComboBox_idl__
#define __com_sun_star_form_control_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
#include <com/sun/star/awt/UnoControlComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index d4a4b48356ad..5105d902b3b9 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CommandButton_idl__
#define __com_sun_star_form_control_CommandButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 203278150878..ad5f7a980eba 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CurrencyField_idl__
#define __com_sun_star_form_control_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
#include <com/sun/star/awt/UnoControlCurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ead9d296fb0e..49da27029784 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_DateField_idl__
#define __com_sun_star_form_control_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__
#include <com/sun/star/awt/UnoControlDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index f40453a4d1e9..95607506b2d6 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_FormattedField_idl__
#define __com_sun_star_form_control_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
#include <com/sun/star/awt/UnoControlFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index ef90c6ec06da..dc298031636e 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_form_control_GridControl_idl__
#define __com_sun_star_form_control_GridControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGrid_idl__
#include <com/sun/star/form/XGrid.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#include <com/sun/star/form/XGridFieldDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeSelector_idl__
#include <com/sun/star/util/XModeSelector.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 5466f2c19c59..b83a76dca57e 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_GroupBox_idl__
#define __com_sun_star_form_control_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
#include <com/sun/star/awt/UnoControlGroupBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 278de5ca515d..6c9461098469 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageButton_idl__
#define __com_sun_star_form_control_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index 10ef14cdf60b..873ddaa2f4c0 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageControl_idl__
#define __com_sun_star_form_control_ImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 40dbe0b2b25f..db14a209c0b0 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
#define __com_sun_star_form_component_InteractionGridControl_idl__
-#ifndef __com_sun_star_form_control_GridControl_idl__
#include <com/sun/star/form/control/GridControl.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index b830a2b3d045..8f5575a21fad 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_control_ListBox_idl__
#define __com_sun_star_form_control_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__
#include <com/sun/star/awt/UnoControlListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index 7f792a221a34..192c222ce4f6 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_control_NavigationToolBar_idl__
#define __com_sun_star_form_control_NavigationToolBar_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index b088f6a782eb..8167da7f0e10 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_NumericField_idl__
#define __com_sun_star_form_control_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
#include <com/sun/star/awt/UnoControlNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index 8c373702bd34..467651633ba8 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_PatternField_idl__
#define __com_sun_star_form_control_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
#include <com/sun/star/awt/UnoControlPatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index b600885453a8..8c4a242f4d02 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_RadioButton_idl__
#define __com_sun_star_form_control_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
#include <com/sun/star/awt/UnoControlRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index a0174a45f673..548585375f3c 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_SubmitButton_idl__
#define __com_sun_star_form_control_SubmitButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
#include <com/sun/star/form/submission/XSubmission.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index c16b4d969932..ec6be0816607 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_form_control_TextField_idl__
#define __com_sun_star_form_control_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index 20cd540c82a2..e28e4b197a00 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_TimeField_idl__
#define __com_sun_star_form_control_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
#include <com/sun/star/awt/UnoControlTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 99145dc4f036..6f131220f967 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
#define __com_sun_star_form_ButtonNavigationHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 609f087f71f1..5fac8099e578 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
#define __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index 11140ee20476..52304087bb3e 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
#define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index c46ef7603b31..b803837c35f5 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_EditPropertyHandler_idl__
#define __com_sun_star_form_inspection_EditPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 3940c082af22..2330573ab930 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_EventHandler_idl__
#define __com_sun_star_form_EventHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 3b51ba36b6ac..d280442aa6c8 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
#define __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index 449368af6a1a..d415949bd9a4 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
#define __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 654e17a21ba4..f4aa43fec4de 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
#define __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 6896225cfbdd..e3919919b38c 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
#define __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index c96844ded821..2572ae86f962 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_runtime_FormOperations_idl__
#define __com_sun_star_form_runtime_FormOperations_idl__
-#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#include <com/sun/star/form/runtime/XFormOperations.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index 0f1ca0df7578..4754b9c3a196 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
#define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index c41c081d58e6..ab108b732f2e 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -28,31 +28,14 @@
#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#define __com_sun_star_form_runtime_XFormOperations_idl__
-#ifndef __com_sun_star_form_runtime_FeatureState_idl__
#include <com/sun/star/form/runtime/FeatureState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
#include <com/sun/star/sdbc/XResultSetUpdate.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index d39bb19258d8..976259f36c7d 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_form_submission_XSubmission_idl__
#define __com_sun_star_form_submission_XSubmission_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 8132bfcdf1ac..7c723b11b618 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#define __com_sun_star_form_submission_XSubmissionSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index 0c9f32f5fa91..f64567d33f0c 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_submission_XSubmissionVetoListener_idl__
#define __com_sun_star_form_submission_XSubmissionVetoListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index 9b436b605efa..cd7e3d7ae890 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
-#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#include <com/sun/star/form/validation/ValidatableControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
module com { module sun { module star { module form { module validation {
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index 5ca51efdab1f..09b6e4490c6a 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#include <com/sun/star/form/validation/XValidatableFormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#include <com/sun/star/form/validation/XValidityConstraintListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index f28c054918b9..92ba6fb4630d 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XFormComponentValidityListener_idl__
#define __com_sun_star_form_validation_XFormComponentValidityListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index aa7799dfff85..a386584ff299 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidatable_idl__
#define __com_sun_star_form_validation_XValidatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index 75690ab349e0..adf36adf380b 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#define __com_sun_star_form_validation_XValidatableFormComponent_idl__
-#ifndef __com_sun_star_form_validation_XValidatable_idl__
#include <com/sun/star/form/validation/XValidatable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 00cbb99aa5d5..ea4e4003bb9e 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidator_idl__
#define __com_sun_star_form_validation_XValidator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index 593b230f6d52..299808f57618 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#define __com_sun_star_form_validation_XValidityConstraintListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================