Strip include guards in idl files part2

65 files changed, 4 insertions, 403 deletions

diff --git a/oovbaapi/ooo/vba/excel/Globals.idl b/oovbaapi/ooo/vba/excel/Globals.idl
index 499bc9a596a0..50d6b662a631 100755
--- a/oovbaapi/ooo/vba/excel/Globals.idl
+++ b/oovbaapi/ooo/vba/excel/Globals.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_Globals_idl__
 #define __ooo_vba_excel_Globals_idl__
 
-#ifndef __ooo_vba_excel_XGlobals_idl__
 #include <ooo/vba/excel/XGlobals.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 #include <com/sun/star/table/XCellRange.idl>
 
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
index cdc058e4c762..a4796baa9743 100755
--- a/oovbaapi/ooo/vba/excel/Hyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_Hyperlink_idl__
 #define __ooo_vba_excel_Hyperlink_idl__
 
-#ifndef __ooo_vba_excel_XHyperlink_idl__
 #include <ooo/vba/excel/XHyperlink.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 #include <com/sun/star/frame/XModel.idl>
 
diff --git a/oovbaapi/ooo/vba/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index 854f5ff58758..5f0af0f8c56b 100755
--- a/oovbaapi/ooo/vba/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_Range_idl__
 #define __ooo_vba_excel_Range_idl__
 
-#ifndef __ooo_vba_excel_XRange_idl__
 #include <ooo/vba/excel/XRange.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 #include <com/sun/star/table/XCellRange.idl>
 
diff --git a/oovbaapi/ooo/vba/excel/TextFrame.idl b/oovbaapi/ooo/vba/excel/TextFrame.idl
index cef8dd002eab..cf7957588d16 100755
--- a/oovbaapi/ooo/vba/excel/TextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/TextFrame.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_TextFrame_idl__
 #define __ooo_vba_excel_TextFrame_idl__
 
-#ifndef __ooo_vba_excel_XTextFrame_idl__
 #include <ooo/vba/excel/XTextFrame.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 
 module ooo {  module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
index b367b8e900cf..c0a7e37ed5a5 100755
--- a/oovbaapi/ooo/vba/excel/Window.idl
+++ b/oovbaapi/ooo/vba/excel/Window.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_Window_idl__
 #define __ooo_vba_excel_Window_idl__
 
-#ifndef __ooo_vba_excel_XWindow_idl__
 #include <ooo/vba/excel/XWindow.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 #include <com/sun/star/frame/XModel.idl>
 
diff --git a/oovbaapi/ooo/vba/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index deb2f36cfd40..1c4c09b8ca82 100755
--- a/oovbaapi/ooo/vba/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
@@ -28,10 +28,7 @@
 #ifndef __ooo_vba_excel_Workbook_idl__
 #define __ooo_vba_excel_Workbook_idl__
 
-#ifndef __ooo_vba_excel_XWorkbook_idl__
 #include <ooo/vba/excel/XWorkbook.idl>
-#endif
-
 #include <com/sun/star/uno/XComponentContext.idl>
 #include <com/sun/star/frame/XModel.idl>
 
diff --git a/oovbaapi/ooo/vba/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index f288d6395d50..330690ffa5e0 100755
--- a/oovbaapi/ooo/vba/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
@@ -28,16 +28,9 @@
 #ifndef __ooo_vba_excel_Worksheet_idl__
 #define __ooo_vba_excel_Worksheet_idl__
 
-#ifndef __ooo_vba_excel_XWorksheet_idl__
 #include <ooo/vba/excel/XWorksheet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_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
 
 module ooo {  module vba { module excel {
 service Worksheet : XWorksheet
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 276d1b16999e..640f18529895 100755
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -31,14 +31,8 @@
 #include <com/sun/star/script/XInvocation.idl>
 #include <ooo/vba/XHelperInterface.idl>
 #include <ooo/vba/XAssistant.idl>
-
-#ifndef __ooo_vba_excel_XFileDialog_idl__
 #include <ooo/vba/XFileDialog.idl>
-#endif
-
-#ifndef __ooo_vba_XFileSearch_idl__
 #include <ooo/vba/XFileSearch.idl>
-#endif
 
 module ooo {  module vba {  module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index f472bcde8a44..9837cc170915 100755
--- a/oovbaapi/ooo/vba/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
@@ -28,21 +28,11 @@
 #ifndef __ooo_vba_excel_XAxes_idl__
 #define __ooo_vba_excel_XAxes_idl__
 
-#ifndef __ooo_vba_excel_XAxis_idl__
 #include <ooo/vba/excel/XAxis.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#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 excel {
 
 interface XAxes
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 5bcd3370a40b..5c8c52c3897c 100755
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -28,13 +28,8 @@
 #ifndef __ooo_vba_excel_XAxis_idl__
 #define __ooo_vba_excel_XAxis_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module excel {
 interface XAxisTitle;
diff --git a/oovbaapi/ooo/vba/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index 8d30c04a4fa2..8b952a1fa69d 100755
--- a/oovbaapi/ooo/vba/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
@@ -28,13 +28,8 @@
 #ifndef __ooo_vba_excel_XAxisTitle_idl__
 #define __ooo_vba_excel_XAxisTitle_idl__
 
-#ifndef __ooo_vba_excel_XTitle_idl__
 #include <ooo/vba/excel/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 module ooo {  module vba { module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index f227ce6cb06b..178f1abf2ed5 100755
--- a/oovbaapi/ooo/vba/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XBorder_idl__
 #define __ooo_vba_excel_XBorder_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 excel {
diff --git a/oovbaapi/ooo/vba/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index 16d75327824a..33c838b2d030 100755
--- a/oovbaapi/ooo/vba/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
@@ -27,15 +27,9 @@
 #ifndef __ooo_vba_excel_XBorders_idl__
 #define __ooo_vba_excel_XBorders_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef  __ooo_vba_excel_XBorder_idl__
 #include <ooo/vba/excel/XBorder.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index 023b93f16dfe..6237ce85c227 100755
--- a/oovbaapi/ooo/vba/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
@@ -27,15 +27,9 @@
 #ifndef __ooo_vba_excel_XCharacters_idl__
 #define __ooo_vba_excel_XCharacters_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XFont_idl__
 #include <ooo/vba/excel/XFont.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index d30bfb07bb94..fe32058427a3 100755
--- a/oovbaapi/ooo/vba/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
@@ -27,16 +27,9 @@
 #ifndef __ooo_vba_excel_XChart_idl__
 #define __ooo_vba_excel_XChart_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_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index accaab8b504c..aa0e5edd9a1d 100755
--- a/oovbaapi/ooo/vba/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
@@ -27,15 +27,9 @@
 #ifndef __ooo_vba_excel_XChartObject_idl__
 #define __ooo_vba_excel_XChartObject_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_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index 7fcd09b5e086..a56e9057724b 100755
--- a/oovbaapi/ooo/vba/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_excel_XChartObjects_idl__
 #define __ooo_vba_excel_XChartObjects_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
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index 64fce8b72d40..b591aa7d5059 100755
--- a/oovbaapi/ooo/vba/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
@@ -28,13 +28,8 @@
 #ifndef __ooo_vba_excel_XChartTitle_idl__
 #define __ooo_vba_excel_XChartTitle_idl__
 
-#ifndef __ooo_vba_excel_XTitle_idl__
 #include <ooo/vba/excel/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 module ooo {  module vba { module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index 0e72d12c5aed..5a42996b1cb7 100755
--- a/oovbaapi/ooo/vba/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_excel_XChart_idl__
 #define __ooo_vba_excel_XChart_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
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index fbd8b5ba1b5b..08926247a356 100755
--- a/oovbaapi/ooo/vba/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
@@ -27,15 +27,9 @@
 #ifndef __ooo_vba_excel_XComments_idl__
 #define __ooo_vba_excel_XComments_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index bb21e09d7f46..ceeecfbde50a 100755
--- a/oovbaapi/ooo/vba/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
@@ -27,16 +27,9 @@
 #ifndef __ooo_vba_excel_XDataLabel_idl__
 #define __ooo_vba_excel_XDataLabel_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_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 0b7cd8b4ee97..02681d2eb57f 100755
--- a/oovbaapi/ooo/vba/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
@@ -27,16 +27,9 @@
 #ifndef __ooo_vba_excel_XDataLabels_idl__
 #define __ooo_vba_excel_XDataLabels_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
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index 5d652605c60e..e8149a36814b 100755
--- a/oovbaapi/ooo/vba/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XDialog_idl__
 #define __ooo_vba_excel_XDialog_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
 
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index ef6f4b7d75a1..4efe93593b47 100755
--- a/oovbaapi/ooo/vba/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XDialogs_idl__
 #define __ooo_vba_excel_XDialogs_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index 82ad577186e4..0f67d5f53ef3 100755
--- a/oovbaapi/ooo/vba/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
@@ -27,16 +27,9 @@
 #ifndef __ooo_vba_excel_XFont_idl__
 #define __ooo_vba_excel_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/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 65837ce2ffd9..14bac900d6e3 100755
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -28,12 +28,8 @@
 #ifndef __ooo_vba_excel_XFormat_idl__
 #define __ooo_vba_excel_XFormat_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index a2c18defdeff..269fb54c8dab 100755
--- a/oovbaapi/ooo/vba/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
@@ -28,13 +28,8 @@
 #ifndef __ooo_vba_excel_XFormatCondition_idl__
 #define __ooo_vba_excel_XFormatCondition_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 7983637faf78..cef9b38633ed 100755
--- a/oovbaapi/ooo/vba/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XFormatConditions_idl__
 #define __ooo_vba_excel_XFormatConditions_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 module ooo {  module vba { module excel
 {
diff --git a/oovbaapi/ooo/vba/excel/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index f68ee9dd71aa..6113801be140 100755
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -27,24 +27,12 @@
 #ifndef __ooo_vba_excel_XGlobals_idl__
 #define __ooo_vba_excel_XGlobals_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __ooo_vba_excel_XWorkbook_idl__
 #include <ooo/vba/excel/XWorkbook.idl>
-#endif
-#ifndef __ooo_vba_excel_XWorksheet_idl__
 #include <ooo/vba/excel/XWorksheet.idl>
-#endif
-#ifndef __ooo_vba_XAssistant_idl__
 #include <ooo/vba/XAssistant.idl>
-#endif
-#ifndef __ooo_vba_excel_XApplication_idl__
 #include <ooo/vba/excel/XApplication.idl>
-#endif
 
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
index dbe9852bd845..76ac8326c135 100755
--- a/oovbaapi/ooo/vba/excel/XHPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_excel_XHPageBreak_idl__
 #define __ooo_vba_excel_XHPageBreak_idl__
 
-#ifndef __ooo_vba_excel_XPageBreak_idl__
 #include <ooo/vba/excel/XPageBreak.idl>
-#endif
 
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
index 9d1e91514d84..b5cd8bb3752a 100755
--- a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
@@ -27,20 +27,10 @@
 #ifndef __ooo_vba_excel_XHPageBreaks_idl__
 #define __ooo_vba_excel_XHPageBreaks_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index bd3758ae18f0..b7aeb43b3f9d 100755
--- a/oovbaapi/ooo/vba/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XInterior_idl__
 #define __ooo_vba_excel_XInterior_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XMenu.idl b/oovbaapi/ooo/vba/excel/XMenu.idl
index 5fbb42761b8d..ffa808c5e625 100755
--- a/oovbaapi/ooo/vba/excel/XMenu.idl
+++ b/oovbaapi/ooo/vba/excel/XMenu.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XMenu_idl__
 #define __ooo_vba_excel_XMenu_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 excel {
diff --git a/oovbaapi/ooo/vba/excel/XMenuBar.idl b/oovbaapi/ooo/vba/excel/XMenuBar.idl
index 76527e52f3df..0e22d1c6d19f 100755
--- a/oovbaapi/ooo/vba/excel/XMenuBar.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuBar.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XMenuBar_idl__
 #define __ooo_vba_excel_XMenuBar_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 excel {
diff --git a/oovbaapi/ooo/vba/excel/XMenuBars.idl b/oovbaapi/ooo/vba/excel/XMenuBars.idl
index 606e533cffe7..40e7966015c0 100755
--- a/oovbaapi/ooo/vba/excel/XMenuBars.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuBars.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_excel_XMenuBars_idl__
 #define __ooo_vba_excel_XMenuBars_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XMenuItem.idl b/oovbaapi/ooo/vba/excel/XMenuItem.idl
index 767cac22fe49..0c82b25f880a 100755
--- a/oovbaapi/ooo/vba/excel/XMenuItem.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuItem.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XMenuItem_idl__
 #define __ooo_vba_excel_XMenuItem_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 excel {
diff --git a/oovbaapi/ooo/vba/excel/XMenuItems.idl b/oovbaapi/ooo/vba/excel/XMenuItems.idl
index 1ddb03d9d11d..c70bdb4511f8 100755
--- a/oovbaapi/ooo/vba/excel/XMenuItems.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuItems.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_excel_XMenuItems_idl__
 #define __ooo_vba_excel_XMenuItems_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XMenus.idl b/oovbaapi/ooo/vba/excel/XMenus.idl
index 2ae728b85321..9f58de5cd5dd 100755
--- a/oovbaapi/ooo/vba/excel/XMenus.idl
+++ b/oovbaapi/ooo/vba/excel/XMenus.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_excel_XMenus_idl__
 #define __ooo_vba_excel_XMenus_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index 3d23a45289c9..09a69ab045b6 100755
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XName_idl__
 #define __ooo_vba_excel_XName_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index c34d7a7a2d36..e8fedc4df688 100755
--- a/oovbaapi/ooo/vba/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XNames_idl__
 #define __ooo_vba_excel_XNames_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/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index a379039c32e8..922de379ffa1 100755
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XOLEObject_idl__
 #define __ooo_vba_excel_XOLEObject_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index 72c778cd38ac..f380984bdda3 100755
--- a/oovbaapi/ooo/vba/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_excel_XOLEObjects_idl__
 #define __ooo_vba_excel_XOLEObjects_idl__
 
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index 1ca0deb1c164..285a1d927ae4 100755
--- a/oovbaapi/ooo/vba/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XOutline_idl__
 #define __ooo_vba_excel_XOutline_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
index 904e7e930bf1..972e125a12a1 100755
--- a/oovbaapi/ooo/vba/excel/XPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_excel_XPageBreak_idl__
 #define __ooo_vba_excel_XPageBreak_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index c9d109e3014c..8b12f550e08a 100755
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XPageSetup_idl__
 #define __ooo_vba_excel_XPageSetup_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 937ecf9a138e..00a4e280524f 100755
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XPivotCache_idl__
 #define __ooo_vba_excel_XPivotCache_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index b4ebb5eb2453..f50d9fd7e7bb 100755
--- a/oovbaapi/ooo/vba/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_excel_XPivotTable_idl__
 #define __ooo_vba_excel_XPivotTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XPivotCache_idl__
 #include <ooo/vba/excel/XPivotCache.idl>
-#endif
-
-#ifndef __ooo_vba__XHelperInterface_idl__
-#define __ooo_vba__XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index 07c4c08c7b80..c2915448cd6d 100755
--- a/oovbaapi/ooo/vba/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XPivotTables_idl__
 #define __ooo_vba_excel_XPivotTables_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/excel/XQueryTable.idl b/oovbaapi/ooo/vba/excel/XQueryTable.idl
index 893fa3062def..ca284c418365 100755
--- a/oovbaapi/ooo/vba/excel/XQueryTable.idl
+++ b/oovbaapi/ooo/vba/excel/XQueryTable.idl
@@ -29,15 +29,8 @@
 #ifndef __ooo_vba_excel_XQueryTable_idl__
 #define __ooo_vba_excel_XQueryTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba__XHelperInterface_idl__
-#define __ooo_vba__XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 87183eaaffd0..62a0994beb68 100755
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -27,36 +27,17 @@
 #ifndef __ooo_vba_excel_XRange_idl__
 #define __ooo_vba_excel_XRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultMethod_idl__
 #include <com/sun/star/script/XDefaultMethod.idl>
-#endif
-#ifndef __com_sun_star_script_XErrorQuery_idl__
 #include <com/sun/star/script/XErrorQuery.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
-#ifndef __ooo_vba_excel_XFormat_idl__
 #include <ooo/vba/excel/XFormat.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
+
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index c8317d12fb68..64b754a67b01 100755
--- a/oovbaapi/ooo/vba/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XSeries_idl__
 #define __ooo_vba_excel_XSeries_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index 09d4ea26b221..cdbf9cbc97ed 100755
--- a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_excel_XSeriesCollection_idl__
 #define __ooo_vba_excel_XSeriesCollection_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
 
 //=============================================================================
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index c07b601bfb0c..5f94f812d85d 100755
--- a/oovbaapi/ooo/vba/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
@@ -28,16 +28,9 @@
 #ifndef __ooo_vba_excel_XStyle_idl__
 #define __ooo_vba_excel_XStyle_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XFormat_idl__
 #include <ooo/vba/excel/XFormat.idl>
-#endif
 
 module ooo {  module vba { module excel {
 interface XStyle
diff --git a/oovbaapi/ooo/vba/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index 3fc0db4e16ad..6ad792e9062a 100755
--- a/oovbaapi/ooo/vba/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
@@ -28,17 +28,9 @@
 #ifndef __ooo_vba_excel_XStyles_idl__
 #define __ooo_vba_excel_XStyles_idl__
 
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#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 excel {
 interface XStyle;
diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index 603145d01037..161e1a29cc04 100755
--- a/oovbaapi/ooo/vba/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_excel_XTextFrame_idl__
 #define __ooo_vba_excel_XTextFrame_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {  module excel {
 interface XTextFrame : com::sun::star::uno::XInterface
diff --git a/oovbaapi/ooo/vba/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 3294de51740a..92d5b7fd8ca9 100755
--- a/oovbaapi/ooo/vba/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
@@ -28,13 +28,8 @@
 #ifndef __ooo_vba_excel_XTitle_idl__
 #define __ooo_vba_excel_XTitle_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
 
 module ooo {  module vba { module excel {
 
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreak.idl b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
index 65ef2b537394..779968d06c98 100755
--- a/oovbaapi/ooo/vba/excel/XVPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_excel_XVPageBreak_idl__
 #define __ooo_vba_excel_XVPageBreak_idl__
 
-#ifndef __ooo_vba_excel_XPageBreak_idl__
 #include <ooo/vba/excel/XPageBreak.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
index 6ad087f009cb..be9be1fc6453 100755
--- a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_excel_XVPageBreaks_idl__
 #define __ooo_vba_excel_XVPageBreaks_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_helper_script_BasicErrorException_idl__
 #include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index e1eb83473efe..3d30482aac9b 100755
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XValidation_idl__
 #define __ooo_vba_excel_XValidation_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 499f27a26bf9..60585f1848af 100755
--- a/oovbaapi/ooo/vba/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XWindows_idl__
 #define __ooo_vba_excel_XWindows_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/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 18af9e39999e..f6e9e91704ad 100755
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XWorkbook_idl__
 #define __ooo_vba_excel_XWorkbook_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
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index de7b031e3c0a..41722ea33eaa 100755
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XWorkbooks_idl__
 #define __ooo_vba_excel_XWorkbooks_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/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 961d1e2af259..2b041199c97c 100755
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -27,22 +27,11 @@
 #ifndef __ooo_vba_excel_XWorksheet_idl__
 #define __ooo_vba_excel_XWorksheet_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_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
-
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
+
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index bc39848d46ef..6f1bce57bb7f 100755
--- a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
@@ -27,21 +27,11 @@
 #ifndef __ooo_vba_excel_XWSFunction_idl__
 #define __ooo_vba_excel_XWSFunction_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_beans_XExactName_idl__
 #include <com/sun/star/beans/XExactName.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
+
 //=============================================================================
 
 module ooo {  module vba {  module excel {
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 36d22ed657bd..13b4f4faf745 100755
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_excel_XWorksheets_idl__
 #define __ooo_vba_excel_XWorksheets_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
 
 //=============================================================================