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 a6c47131a5..69d01deee3 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 dd6e762ab5..51edac4403 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 7b41e9e682..e21f4e0eff 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 edbd0920bd..338653b8f4 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 2049cf5342..b3e2042654 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 5a2e9a4645..7c001f1ebf 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 0197cb2f19..c802e210d7 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 afffe8edbb..17474e2535 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 5c3ea226a2..2f3c1e36c9 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 103ffac55a..787e4f4f8b 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 7b67c995fa..c60284a21d 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 1310ca67b1..3a250be0bb 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 a11fa98e6b..245d8dbdbc 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 c04a2029bd..2000a45b31 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 bdb1f89e18..88e3683fbb 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 620f72001b..eb1b0a51fc 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 1533a50c66..c35c56e539 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 5ca644c12d..94f6c37cae 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 6c35904662..7ba2f82cde 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 ddfd3dae0c..06a4c7cb3f 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 0a89347ea9..301d23a7b3 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 53c85d98e5..3915324a23 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 49e4320c2a..7094629c5a 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 42abf15426..41b8d9137a 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 e197bd3e1e..60b10604bf 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 866a2831fc..a86d6fcda0 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 f26c07ff50..1ca6190052 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 bc6af54c36..ea0c7b4389 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 ea4d9448a8..c8ba17cf17 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 9f17bc3190..c1b0913e05 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 8012803acc..e5929a9af0 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 f4763fdbc7..2d7b6b7430 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 e329a7208c..1965ce59a4 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 a2a7bded98..658ce07235 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 bbdcf60df9..26606b467c 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 d115a59628..3b76552718 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 6ffc4d1be9..edca3789f5 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 3f7d7975cf..cd214b71b7 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 48c710a26b..d8d2233ecb 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 eec1a7fb20..415fefade3 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 2d936e087b..78527008e3 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 9fdf6a80ae..ae225cddfc 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 15001c2e6b..b213b5cbca 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 c3574924d0..6a4f07848c 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 c27087d56e..9d8e4ca736 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 0366dfef8f..ed92d21514 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 b151eb2c62..9ce163a457 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 21ee17c464..76be892740 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 
 {