Strip include guards in idl files part 3 (end)

48 files changed, 1 insertions, 208 deletions

diff --git a/oovbaapi/ooo/vba/ControlProvider.idl b/oovbaapi/ooo/vba/ControlProvider.idl
index fc45173763d7..aa43e1e4e41e 100755
--- a/oovbaapi/ooo/vba/ControlProvider.idl
+++ b/oovbaapi/ooo/vba/ControlProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_ControlProvider_idl__
 #define __ooo_vba_ControlProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
index a9077aa4cf3b..37eb51ee2a84 100755
--- a/oovbaapi/ooo/vba/XAssistant.idl
+++ b/oovbaapi/ooo/vba/XAssistant.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XAssistant_idl__
 #define __ooo_vba_XAssistant_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 63982aab36d6..3bdfede3dd31 100755
--- a/oovbaapi/ooo/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
@@ -27,19 +27,10 @@
 #ifndef __ooo_vba_XCollection_idl__
 #define __ooo_vba_XCollection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultMethod_idl__
 #include <com/sun/star/script/XDefaultMethod.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBarButton.idl b/oovbaapi/ooo/vba/XCommandBarButton.idl
index 4914bbc569cb..87efce44079f 100755
--- a/oovbaapi/ooo/vba/XCommandBarButton.idl
+++ b/oovbaapi/ooo/vba/XCommandBarButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_XCommandBarButton_idl__
 #define __ooo_vba_XCommandBarButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
index 7f20a6bf2c3f..d27922dd7fd4 100755
--- a/oovbaapi/ooo/vba/XCommandBarControl.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XCommandBarControl_idl__
 #define __ooo_vba_XCommandBarControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
index f2e0824cf5b5..f43d74d2b2fc 100755
--- a/oovbaapi/ooo/vba/XCommandBarControls.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XCommandBarControls_idl__
 #define __ooo_vba_XCommandBarControls_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
index 484b7bc76629..88ffdf370aed 100755
--- a/oovbaapi/ooo/vba/XCommandBars.idl
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XCommandBars_idl__
 #define __ooo_vba_XCommandBars_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XControlProvider.idl b/oovbaapi/ooo/vba/XControlProvider.idl
index 23f890d5a1c3..ecd73d496770 100755
--- a/oovbaapi/ooo/vba/XControlProvider.idl
+++ b/oovbaapi/ooo/vba/XControlProvider.idl
@@ -27,24 +27,11 @@
 #ifndef __ooo_vba_XControlProvider_idl__
 #define __ooo_vba_XControlProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XControlShape_idl__
 #include <com/sun/star/drawing/XControlShape.idl>
-#endif
-#ifndef __ooo_vba_msforms_XControl_idl__
 #include <ooo/vba/msforms/XControl.idl>
-#endif
 
 module ooo {  module vba {
 
diff --git a/oovbaapi/ooo/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index 84ef9c2c412c..4b7b5f68f91a 100755
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -28,9 +28,7 @@
 #ifndef __ooo_vba__XErrObject_idl__
 #define __ooo_vba__XErrObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module ooo {  module vba  {
 //==============================================================================
diff --git a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
index 103ffac55a96..787e4f4f8bb0 100755
--- a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
+++ b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
@@ -30,9 +30,7 @@
 #ifndef __ooo_vba_excel_XFileDialogSelectedItems_idl__
 #define __ooo_vba_excel_XFileDialogSelectedItems_idl__
 
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {
diff --git a/oovbaapi/ooo/vba/XFileSearch.idl b/oovbaapi/ooo/vba/XFileSearch.idl
index 7b67c995fa7a..c60284a21d18 100755
--- a/oovbaapi/ooo/vba/XFileSearch.idl
+++ b/oovbaapi/ooo/vba/XFileSearch.idl
@@ -29,13 +29,8 @@
 #ifndef __ooo_vba_XFileSearch_idl__
 #define __ooo_vba_XFileSearch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef  __ooo_vba_XFoundFiles_idl__
 #include <ooo/vba/XFoundFiles.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XFontBase.idl b/oovbaapi/ooo/vba/XFontBase.idl
index 93d3749e85bd..7731531aef48 100755
--- a/oovbaapi/ooo/vba/XFontBase.idl
+++ b/oovbaapi/ooo/vba/XFontBase.idl
@@ -27,16 +27,9 @@
 #ifndef __ooo_vba_XFont_idl__
 #define __ooo_vba_XFont_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XFoundFiles.idl b/oovbaapi/ooo/vba/XFoundFiles.idl
index a11fa98e6b56..245d8dbdbcc1 100755
--- a/oovbaapi/ooo/vba/XFoundFiles.idl
+++ b/oovbaapi/ooo/vba/XFoundFiles.idl
@@ -29,13 +29,8 @@
 #ifndef __ooo_vba_XFoundFiles_idl__
 #define __ooo_vba_XFoundFiles_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XGlobalsBase.idl b/oovbaapi/ooo/vba/XGlobalsBase.idl
index 1d41463b53c9..dd2d7b8e4c53 100755
--- a/oovbaapi/ooo/vba/XGlobalsBase.idl
+++ b/oovbaapi/ooo/vba/XGlobalsBase.idl
@@ -27,15 +27,10 @@
 #ifndef __ooo_vba_XGlobalsBase_idl__
 #define __ooo_vba_XGlobalsBase_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
+
 module ooo {  module vba {
 interface XGlobalsBase
 {
diff --git a/oovbaapi/ooo/vba/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index 17059ede9dcb..c5e46bb71f0c 100755
--- a/oovbaapi/ooo/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
@@ -27,10 +27,7 @@
 #ifndef __ooo_vba_XPropValue_idl__
 #define __ooo_vba_XPropValue_idl__
 
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XVBAAppService.idl b/oovbaapi/ooo/vba/XVBAAppService.idl
index 5ff1d41710f6..2a38a531b47f 100755
--- a/oovbaapi/ooo/vba/XVBAAppService.idl
+++ b/oovbaapi/ooo/vba/XVBAAppService.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_appservice_idl__
 #define __ooo_vba_appservice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
 #include <com/sun/star/script/XLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XVBADocService.idl b/oovbaapi/ooo/vba/XVBADocService.idl
index 398775de4479..7c19e38e2a0e 100755
--- a/oovbaapi/ooo/vba/XVBADocService.idl
+++ b/oovbaapi/ooo/vba/XVBADocService.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_socservice_idl__
 #define __ooo_vba_appservice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
 #include <com/sun/star/script/XLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index 1304ce474369..29894494fd96 100755
--- a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XVBAToOOEventDescGen_idl__
 #define __ooo_vba_XVBAToOOEventDescGen_idl__
 
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
 #include <com/sun/star/script/ScriptEventDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_script_XScriptEventsSupplier_idl__
 #include <com/sun/star/script/XScriptEventsSupplier.idl>
-#endif
 
 module ooo {  module vba {
 interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
diff --git a/oovbaapi/ooo/vba/XWindowBase.idl b/oovbaapi/ooo/vba/XWindowBase.idl
index 3872a9af5dd3..ceedde24bd37 100755
--- a/oovbaapi/ooo/vba/XWindowBase.idl
+++ b/oovbaapi/ooo/vba/XWindowBase.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_XHelperWindow_idl__
 #define __ooo_vba_XHelperWindow_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index 24cf1ba26c60..c88018a0ad18 100755
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XButton_idl__
 #define __ooo_vba_msforms_XButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index 0a89347ea9bc..301d23a7b396 100755
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XCheckBox_idl__
 #define __ooo_vba_msforms_XCheckBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 0c9e1ee83a1d..ef3a0f8a732f 100755
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XColorFormat_idl__
 #define __ooo_vba_msforms_XColorFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index d3285c7d78b0..286383a5d89b 100755
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XComboBox_idl__
 #define __ooo_vba_msforms_XComboBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 3de8db1eb06c..5b59999f2fc1 100755
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -27,16 +27,8 @@
 #ifndef __ooo_vba_msforms_XControl_idl__
 #define __ooo_vba_msforms_XControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {  module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index 11325303d56c..674ea6e8c608 100755
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XControls_idl__
 #define __ooo_vba_msforms_XControls_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 module ooo {  module vba { module msforms {
 
 interface XControl;
diff --git a/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 02cdc39ad21b..b007245f94ef 100755
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_msforms_XFillFormat_idl__
 #define __ooo_vba_msforms_XFillFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
 #include <ooo/vba/msforms/XColorFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XFillFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 9ed6f9d45046..4680da630818 100755
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XGroupBox_idl__
 #define __ooo_vba_msforms_XGroupBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index f37b62ce146e..2c77aace76e5 100755
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XImage_idl__
 #define __ooo_vba_msforms_XImage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 476ac859b7aa..cead2221575c 100755
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XLabel_idl__
 #define __ooo_vba_msforms_XLabel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index 72df94ee5cd7..ee7eba2e96b0 100755
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_msforms_XLineFormat_idl__
 #define __ooo_vba_msforms_XLineFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
 #include <ooo/vba/msforms/XColorFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XLineFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 6058d826b4d0..27b6f86bbfbf 100755
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XListBox_idl__
 #define __ooo_vba_msforms_XListBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index 7d0c8ee76421..d30026e78ffc 100755
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XMultiPage_idl__
 #define __ooo_vba_msforms_XMultiPage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index fb290be32cda..283efca02610 100755
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XPage_idl__
 #define __ooo_vba_msforms_XPage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index 4eb6a2bcf78f..fabc48dd9058 100755
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -28,9 +28,7 @@
 #define __ooo_vba_msforms_XPictureFormat_idl__
 
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XPictureFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index c40b3f6c1f01..4364f083d320 100755
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XProgressBar_idl__
 #define __ooo_vba_msforms_XProgressBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index b2289ce33331..1c54d6d570c2 100755
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XRadioButton_idl__
 #define __ooo_vba_msforms_XRadioButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
index 6ffc4d1be98b..edca3789f534 100755
--- a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -29,9 +29,7 @@
 #ifndef __ooo_vba_msforms_XReturnInteger_idl__
 #define __ooo_vba_msforms_XReturnInteger_idl__
 
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
 //=============================================================================
 
 module msforms
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
index 3f7d7975cf8c..cd214b71b799 100755
--- a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -29,9 +29,7 @@
 #ifndef __ooo_vba_msforms_XReturnInteger_idl__
 #define __ooo_vba_msforms_XReturnInteger_idl__
 
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
 //=============================================================================
 
 module msforms
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 37f4a8c32868..7d6c5aea3c4b 100755
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XScrollBar_idl__
 #define __ooo_vba_msforms_XScrollBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index b31dab7a1d91..602b3fdf35bb 100755
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_msforms_XShape_idl__
 #define __ooo_vba_msforms_XShape_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XLineFormat_idl__
 #include <ooo/vba/msforms/XLineFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XFillFormat_idl__
 #include <ooo/vba/msforms/XFillFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XPictureFormat_idl__
 #include <ooo/vba/msforms/XPictureFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XShapeRange;
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 0e5e2b5a039d..6aa5778f40fe 100755
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_msforms_XShapeRange_idl__
 #define __ooo_vba_msforms_XShapeRange_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XShape_idl__
 #include <ooo/vba/msforms/XShape.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index d6ecfec13525..63aaa60e73a3 100755
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XShapes_idl__
 #define __ooo_vba_msforms_XShapes_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 module ooo {  module vba { module msforms {
 
 interface XShapeRange;
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index 3732b638f1ab..07e0bac846eb 100755
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XSpinButton_idl__
 #define __ooo_vba_msforms_XSpinButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index 9c6b55e5ca6d..e10ad3fb1bae 100755
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XTextBox_idl__
 #define __ooo_vba_msforms_XTextBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index 30a9adbed7f5..04c504ecd788 100755
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XTextBoxShape_idl__
 #define __ooo_vba_msforms_XTextBoxShape_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XCharacters_idl
 #include <ooo/vba/excel/XCharacters.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextFrame.idl b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
index fe29f35275b2..7042570e1dc5 100755
--- a/oovbaapi/ooo/vba/msforms/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XTextFrame_idl__
 #define __ooo_vba_msforms_XTextFrame_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {  module msforms {
 interface XTextFrame : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index e66eea54babb..e47e106423e8 100755
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XToggleButton_idl__
 #define __ooo_vba_msforms_XToggleButton_idl__
 
-#ifndef __ooo_vba_msforms_XButton_idl__
 #include <ooo/vba/msforms/XButton.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index c06aa2902b53..4d413777e30a 100755
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XUserForm_idl__
 #define __ooo_vba_msforms_XUserForm_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 module ooo {  module vba { module msforms {
 interface XUserForm
 {