summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/frame
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
commit45e7a5b78c29ebc5bd43ba65d1b02cb4457be613 (patch)
treee35eb3316b7f97bf0126b74d8816fdaabbc727e8 /offapi/com/sun/star/frame
parent3ab3374ed3863c7c6e329c56aabec31d6c908656 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/frame')
-rw-r--r--offapi/com/sun/star/frame/Components.idl2
-rw-r--r--offapi/com/sun/star/frame/ContentHandler.idl2
-rw-r--r--offapi/com/sun/star/frame/ContentHandlerFactory.idl8
-rw-r--r--offapi/com/sun/star/frame/ControlCommand.idl2
-rw-r--r--offapi/com/sun/star/frame/ControlEvent.idl4
-rw-r--r--offapi/com/sun/star/frame/Controller.idl20
-rw-r--r--offapi/com/sun/star/frame/Desktop.idl14
-rw-r--r--offapi/com/sun/star/frame/DesktopTask.idl20
-rw-r--r--offapi/com/sun/star/frame/DesktopTasks.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchDescriptor.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchHelper.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchInformation.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchProvider.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchRecorder.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchRecorderSupplier.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchResultEvent.idl5
-rw-r--r--offapi/com/sun/star/frame/DispatchStatement.idl2
-rw-r--r--offapi/com/sun/star/frame/DocumentTemplates.idl2
-rw-r--r--offapi/com/sun/star/frame/DoubleInitializationException.idl2
-rw-r--r--offapi/com/sun/star/frame/FeatureStateEvent.idl5
-rw-r--r--offapi/com/sun/star/frame/Frame.idl26
-rw-r--r--offapi/com/sun/star/frame/FrameActionEvent.idl8
-rw-r--r--offapi/com/sun/star/frame/FrameControl.idl5
-rw-r--r--offapi/com/sun/star/frame/FrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/FrameLoaderFactory.idl8
-rw-r--r--offapi/com/sun/star/frame/FramesContainer.idl2
-rw-r--r--offapi/com/sun/star/frame/GlobalEventBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/frame/IllegalArgumentIOException.idl2
-rw-r--r--offapi/com/sun/star/frame/LayoutManager.idl20
-rw-r--r--offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl2
-rw-r--r--offapi/com/sun/star/frame/ModuleManager.idl5
-rw-r--r--offapi/com/sun/star/frame/PopupMenuController.idl15
-rw-r--r--offapi/com/sun/star/frame/PopupMenuControllerFactory.idl5
-rw-r--r--offapi/com/sun/star/frame/ProtocolHandler.idl5
-rw-r--r--offapi/com/sun/star/frame/SessionManager.idl2
-rw-r--r--offapi/com/sun/star/frame/Settings.idl2
-rw-r--r--offapi/com/sun/star/frame/StatusbarController.idl11
-rw-r--r--offapi/com/sun/star/frame/StatusbarControllerFactory.idl5
-rw-r--r--offapi/com/sun/star/frame/SynchronousFrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/Task.idl5
-rw-r--r--offapi/com/sun/star/frame/TemplateAccess.idl5
-rw-r--r--offapi/com/sun/star/frame/TerminationVetoException.idl2
-rw-r--r--offapi/com/sun/star/frame/TitleChangedEvent.idl2
-rw-r--r--offapi/com/sun/star/frame/ToolbarController.idl14
-rw-r--r--offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl2
-rw-r--r--offapi/com/sun/star/frame/UnknownModuleException.idl2
-rw-r--r--offapi/com/sun/star/frame/XBorderResizeListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl5
-rw-r--r--offapi/com/sun/star/frame/XComponentLoader.idl14
-rw-r--r--offapi/com/sun/star/frame/XComponentRegistry.idl5
-rw-r--r--offapi/com/sun/star/frame/XConfigManager.idl5
-rw-r--r--offapi/com/sun/star/frame/XControlNotificationListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XController.idl2
-rw-r--r--offapi/com/sun/star/frame/XControllerBorder.idl8
-rw-r--r--offapi/com/sun/star/frame/XDesktop.idl14
-rw-r--r--offapi/com/sun/star/frame/XDesktopTask.idl5
-rw-r--r--offapi/com/sun/star/frame/XDispatch.idl11
-rw-r--r--offapi/com/sun/star/frame/XDispatchHelper.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchInformationProvider.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchProvider.idl11
-rw-r--r--offapi/com/sun/star/frame/XDispatchProviderInterception.idl5
-rw-r--r--offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl2
-rw-r--r--offapi/com/sun/star/frame/XDispatchRecorder.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl8
-rw-r--r--offapi/com/sun/star/frame/XDispatchResultListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XDocumentTemplates.idl5
-rw-r--r--offapi/com/sun/star/frame/XExtendedFilterDetection.idl5
-rw-r--r--offapi/com/sun/star/frame/XFilterDetect.idl2
-rw-r--r--offapi/com/sun/star/frame/XFrame.idl5
-rw-r--r--offapi/com/sun/star/frame/XFrameActionListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XFrameLoader.idl11
-rw-r--r--offapi/com/sun/star/frame/XFrameLoaderQuery.idl8
-rw-r--r--offapi/com/sun/star/frame/XFrameSetModel.idl2
-rw-r--r--offapi/com/sun/star/frame/XFrames.idl5
-rw-r--r--offapi/com/sun/star/frame/XFramesSupplier.idl2
-rw-r--r--offapi/com/sun/star/frame/XInplaceLayout.idl2
-rw-r--r--offapi/com/sun/star/frame/XInterceptorInfo.idl2
-rw-r--r--offapi/com/sun/star/frame/XLayoutManager.idl23
-rw-r--r--offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/frame/XLayoutManagerListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XLoadEventListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XLoadable.idl11
-rw-r--r--offapi/com/sun/star/frame/XMenuBarAcceptor.idl5
-rw-r--r--offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl5
-rw-r--r--offapi/com/sun/star/frame/XModel.idl14
-rw-r--r--offapi/com/sun/star/frame/XModule.idl8
-rw-r--r--offapi/com/sun/star/frame/XModuleManager.idl8
-rw-r--r--offapi/com/sun/star/frame/XNotifyingDispatch.idl5
-rw-r--r--offapi/com/sun/star/frame/XPopupMenuController.idl2
-rw-r--r--offapi/com/sun/star/frame/XRecordableDispatch.idl8
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerClient.idl2
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerListener.idl2
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerListener2.idl5
-rw-r--r--offapi/com/sun/star/frame/XStatusListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XStatusbarController.idl11
-rw-r--r--offapi/com/sun/star/frame/XStorable.idl8
-rw-r--r--offapi/com/sun/star/frame/XStorable2.idl11
-rw-r--r--offapi/com/sun/star/frame/XSubToolbarController.idl2
-rw-r--r--offapi/com/sun/star/frame/XSynchronousDispatch.idl8
-rw-r--r--offapi/com/sun/star/frame/XSynchronousFrameLoader.idl8
-rw-r--r--offapi/com/sun/star/frame/XTask.idl2
-rw-r--r--offapi/com/sun/star/frame/XTasksSupplier.idl8
-rw-r--r--offapi/com/sun/star/frame/XTerminateListener.idl8
-rw-r--r--offapi/com/sun/star/frame/XTerminateListener2.idl2
-rw-r--r--offapi/com/sun/star/frame/XTitle.idl5
-rw-r--r--offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/frame/XTitleChangeListener.idl5
-rw-r--r--offapi/com/sun/star/frame/XToolbarController.idl5
-rw-r--r--offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl11
-rw-r--r--offapi/com/sun/star/frame/XUIControllerRegistration.idl2
-rw-r--r--offapi/com/sun/star/frame/XUntitledNumbers.idl5
-rw-r--r--offapi/com/sun/star/frame/XUrlList.idl2
-rw-r--r--offapi/com/sun/star/frame/XWindowArranger.idl2
113 files changed, 0 insertions, 691 deletions
diff --git a/offapi/com/sun/star/frame/Components.idl b/offapi/com/sun/star/frame/Components.idl
index f265161053c8..b630949a00d6 100644
--- a/offapi/com/sun/star/frame/Components.idl
+++ b/offapi/com/sun/star/frame/Components.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_Components_idl__
#define __com_sun_star_frame_Components_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ContentHandler.idl b/offapi/com/sun/star/frame/ContentHandler.idl
index 3a4655d40391..58f29c01ae0b 100644
--- a/offapi/com/sun/star/frame/ContentHandler.idl
+++ b/offapi/com/sun/star/frame/ContentHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_ContentHandler_idl__
#define __com_sun_star_frame_ContentHandler_idl__
-#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
#include <com/sun/star/frame/XNotifyingDispatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index dab4a6a6f0c1..c800d19d279d 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_ContentHandlerFactory_idl__
#define __com_sun_star_frame_ContentHandlerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index 9be9a6948349..58cac6e3c4b8 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -28,9 +28,7 @@
#define __com_sun_star_frame_ControlCommand_idl__
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index b6fa0198e1e4..4ae0bc1a18f8 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_frame_ControlEvent_idl__
#define __com_sun_star_frame_ControlEvent_idl__
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Controller.idl b/offapi/com/sun/star/frame/Controller.idl
index 53fd6e6951b1..298249d1d44c 100644
--- a/offapi/com/sun/star/frame/Controller.idl
+++ b/offapi/com/sun/star/frame/Controller.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_frame_Controller_idl__
#define __com_sun_star_frame_Controller_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
#include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUserInputInterception_idl__
#include <com/sun/star/awt/XUserInputInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
#include <com/sun/star/datatransfer/XTransferableSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl
index 96a1c8fb07b4..9c534cbe7ee1 100644
--- a/offapi/com/sun/star/frame/Desktop.idl
+++ b/offapi/com/sun/star/frame/Desktop.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_Desktop_idl__
#define __com_sun_star_frame_Desktop_idl__
-#ifndef __com_sun_star_frame_Frame_idl__
#include <com/sun/star/frame/Frame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
#include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XComponentLoader_idl__
#include <com/sun/star/frame/XComponentLoader.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DesktopTask.idl b/offapi/com/sun/star/frame/DesktopTask.idl
index 3640f57c332f..a6f9de46fc17 100644
--- a/offapi/com/sun/star/frame/DesktopTask.idl
+++ b/offapi/com/sun/star/frame/DesktopTask.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_frame_DesktopTask_idl__
#define __com_sun_star_frame_DesktopTask_idl__
-#ifndef __com_sun_star_frame_XDesktopTask_idl__
#include <com/sun/star/frame/XDesktopTask.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XWindowArranger_idl__
#include <com/sun/star/frame/XWindowArranger.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DesktopTasks.idl b/offapi/com/sun/star/frame/DesktopTasks.idl
index afb479209b3d..34bdfccc9859 100644
--- a/offapi/com/sun/star/frame/DesktopTasks.idl
+++ b/offapi/com/sun/star/frame/DesktopTasks.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DesktopTasks_idl__
#define __com_sun_star_frame_DesktopTasks_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index 71b3ae345a6a..1aaaf9593740 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
#define __com_sun_star_frame_DispatchDescriptor_idl__
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 973b08628e44..4047eadb0b41 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchHelper_idl__
#define __com_sun_star_frame_DispatchHelper_idl__
-#ifndef __com_sun_star_frame_XDispatchHelper_idl__
#include <com/sun/star/frame/XDispatchHelper.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index 861699f018e7..fadd3db939bb 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchInformation_idl__
#define __com_sun_star_frame_DispatchInformation_idl__
-#ifndef __com_sun_star_frame_CommandGroup_idl__
#include <com/sun/star/frame/CommandGroup.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchProvider.idl b/offapi/com/sun/star/frame/DispatchProvider.idl
index 5ec66602055e..de33c6cfda69 100644
--- a/offapi/com/sun/star/frame/DispatchProvider.idl
+++ b/offapi/com/sun/star/frame/DispatchProvider.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_DispatchProvider_idl__
#define __com_sun_star_frame_DispatchProvider_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index b41cd52367d4..56a693fd25c7 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_DispatchRecorder_idl__
#define __com_sun_star_frame_DispatchRecorder_idl__
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index cf5624cfe3fb..6e476eeecbf2 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchRecorderSupplier_idl__
#define __com_sun_star_frame_DispatchRecorderSupplier_idl__
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchResultEvent.idl b/offapi/com/sun/star/frame/DispatchResultEvent.idl
index 467342211894..6bd95e340bd2 100644
--- a/offapi/com/sun/star/frame/DispatchResultEvent.idl
+++ b/offapi/com/sun/star/frame/DispatchResultEvent.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
#define __com_sun_star_frame_DispatchResultEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index c1965b0db838..c27f8cf004b8 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DispatchStatement_idl__
#define __com_sun_star_frame_DispatchStatement_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index b3c44ffe83ad..2912a7ef8087 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_DocumentTemplates_idl__
#define __com_sun_star_frame_DocumentTemplates_idl__
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index f1121156a2cc..d225770b6e83 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FeatureStateEvent.idl b/offapi/com/sun/star/frame/FeatureStateEvent.idl
index c812424e42ac..ae58f8d62766 100644
--- a/offapi/com/sun/star/frame/FeatureStateEvent.idl
+++ b/offapi/com/sun/star/frame/FeatureStateEvent.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
#define __com_sun_star_frame_FeatureStateEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index 8c7a480e71d0..794eb1beeb70 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -27,41 +27,15 @@
#ifndef __com_sun_star_frame_Frame_idl__
#define __com_sun_star_frame_Frame_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
#include <com/sun/star/task/XStatusIndicatorFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
#include <com/sun/star/frame/XDispatchInformationProvider.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl
index 46a4b481437e..27cc6acdad34 100644
--- a/offapi/com/sun/star/frame/FrameActionEvent.idl
+++ b/offapi/com/sun/star/frame/FrameActionEvent.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameActionEvent_idl__
#define __com_sun_star_frame_FrameActionEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameAction_idl__
#include <com/sun/star/frame/FrameAction.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index 54ccbcb888b4..b163fcd2062e 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_FrameControl_idl__
#define __com_sun_star_frame_FrameControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameLoader.idl b/offapi/com/sun/star/frame/FrameLoader.idl
index 3baa26e5e8d6..f2799135a99c 100644
--- a/offapi/com/sun/star/frame/FrameLoader.idl
+++ b/offapi/com/sun/star/frame/FrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameLoader_idl__
#define __com_sun_star_frame_FrameLoader_idl__
-#ifndef __com_sun_star_frame_XFrameLoader_idl__
#include <com/sun/star/frame/XFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index 98bc7f16b9f0..f911a4358759 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_FrameLoaderFactory_idl__
#define __com_sun_star_frame_FrameLoaderFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
#include <com/sun/star/container/XContainerQuery.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/FramesContainer.idl b/offapi/com/sun/star/frame/FramesContainer.idl
index 450da0ac0538..9fe185c5397f 100644
--- a/offapi/com/sun/star/frame/FramesContainer.idl
+++ b/offapi/com/sun/star/frame/FramesContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_FramesContainer_idl__
#define __com_sun_star_frame_FramesContainer_idl__
-#ifndef __com_sun_star_frame_XFrames_idl__
#include <com/sun/star/frame/XFrames.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
index 23c98809acbd..7f0ce10ccac0 100644
--- a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_GlobalEventBroadcaster_idl__
#define __com_sun_star_frame_GlobalEventBroadcaster_idl__
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
#include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
#include <com/sun/star/document/XEventsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 2154daac70fe..a0bef818d0fd 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index e54df74e59d3..92d987892e60 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -28,33 +28,13 @@
#ifndef __com_sun_star_frame_LayoutManager_idl__
#define __com_sun_star_frame_LayoutManager_idl__
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
#include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrameActionListener_idl__
#include <com/sun/star/frame/XFrameActionListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
#include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XInplaceLayout_idl__
#include <com/sun/star/frame/XInplaceLayout.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
#include <com/sun/star/frame/XMenuBarMergingAcceptor.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index cb1bd009afe3..53084a1f11eb 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_MediaTypeDetectionHelper_idl__
#define __com_sun_star_frame_MediaTypeDetectionHelper_idl__
-#ifndef __com_sun_star_util_XStringMapping_idl__
#include <com/sun/star/util/XStringMapping.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index ab8bff22d72e..5ed478d959f7 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_ModuleManager_idl__
#define __com_sun_star_frame_ModuleManager_idl__
-#ifndef __com_sun_star_frame_XModuleManager_idl__
#include <com/sun/star/frame/XModuleManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index 1c2cf9381b38..bf2b83d84869 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -28,26 +28,11 @@
#ifndef __com_sun_star_frame_PopupMenuController_idl__
#define __com_sun_star_frame_PopupMenuController_idl__
-#ifndef __com_sun_star_frame_XPopupMenuController_idl__
#include <com/sun/star/frame/XPopupMenuController.idl>
-#endif
-
-#ifndef _com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 3c8d2babc495..78b3937f5c7f 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_PopupMenuControllerFactory_idl__
#define __com_sun_star_frame_PopupMenuControllerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ProtocolHandler.idl b/offapi/com/sun/star/frame/ProtocolHandler.idl
index 3d56efd20b0a..85e629d679fe 100644
--- a/offapi/com/sun/star/frame/ProtocolHandler.idl
+++ b/offapi/com/sun/star/frame/ProtocolHandler.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_ProtocolHandler_idl__
#define __com_sun_star_frame_ProtocolHandler_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/SessionManager.idl b/offapi/com/sun/star/frame/SessionManager.idl
index 71a56e011928..06d73679216f 100644
--- a/offapi/com/sun/star/frame/SessionManager.idl
+++ b/offapi/com/sun/star/frame/SessionManager.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_SessionManager_idl__
#define __com_sun_star_frame_SessionManager_idl__
-#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
#include <com/sun/star/frame/XSessionManagerClient.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Settings.idl b/offapi/com/sun/star/frame/Settings.idl
index 81a2a6a857d4..4f9365c6bac6 100644
--- a/offapi/com/sun/star/frame/Settings.idl
+++ b/offapi/com/sun/star/frame/Settings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_Settings_idl__
#define __com_sun_star_frame_Settings_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 4903f3b10d63..b68a62ae6041 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_StatusbarController_idl__
#define __com_sun_star_frame_StatusbarController_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
#include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusbarController_idl__
#include <com/sun/star/frame/XStatusbarController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index dd2b756c319a..c0d9e46c33bf 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_StatusbarControllerFactory_idl__
#define __com_sun_star_frame_StatusbarControllerFactory_idl__
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
index 417bfd86afb8..51ec02d3a3a3 100644
--- a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_SynchronousFrameLoader_idl__
#define __com_sun_star_frame_SynchronousFrameLoader_idl__
-#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
#include <com/sun/star/frame/XSynchronousFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 76e7bef933a9..49dc9af232ca 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_Task_idl__
#define __com_sun_star_frame_Task_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
#include <com/sun/star/frame/XTask.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TemplateAccess.idl b/offapi/com/sun/star/frame/TemplateAccess.idl
index 29159ab2d78b..6110da1468e7 100644
--- a/offapi/com/sun/star/frame/TemplateAccess.idl
+++ b/offapi/com/sun/star/frame/TemplateAccess.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_TemplateAccess_idl__
#define __com_sun_star_frame_TemplateAccess_idl__
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TerminationVetoException.idl b/offapi/com/sun/star/frame/TerminationVetoException.idl
index 1c215b05da8b..df92e499f139 100644
--- a/offapi/com/sun/star/frame/TerminationVetoException.idl
+++ b/offapi/com/sun/star/frame/TerminationVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#define __com_sun_star_frame_TerminationVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TitleChangedEvent.idl b/offapi/com/sun/star/frame/TitleChangedEvent.idl
index f93ef7ccc564..da0d5a820be7 100644
--- a/offapi/com/sun/star/frame/TitleChangedEvent.idl
+++ b/offapi/com/sun/star/frame/TitleChangedEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
#define __com_sun_star_frame_TitleChangedEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 4e2753125767..5d7fff1f54aa 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_frame_ToolbarController_idl__
#define __com_sun_star_frame_ToolbarController_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
#include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XToolbarController_idl__
#include <com/sun/star/frame/XToolbarController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSubToolbarController_idl__
#include <com/sun/star/frame/XSubToolbarController.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 0f982fa0f4cb..576535859ff0 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
#define __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
-#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
#include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 9b3169c1dcbe..832a3090f66b 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_UnknownModuleException_idl__
#define __com_sun_star_frame_UnknownModuleException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XBorderResizeListener.idl b/offapi/com/sun/star/frame/XBorderResizeListener.idl
index c6c96dc9c7fc..2d3f9b457825 100644
--- a/offapi/com/sun/star/frame/XBorderResizeListener.idl
+++ b/offapi/com/sun/star/frame/XBorderResizeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
#define __com_sun_star_frame_XBorderResizeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_BorderWidths_idl__
#include <com/sun/star/frame/BorderWidths.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
index e6ee4b618519..8b041fcad3f3 100644
--- a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
+++ b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XBrowseHistoryRegistry_idl__
#define __com_sun_star_frame_XBrowseHistoryRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentLoader.idl b/offapi/com/sun/star/frame/XComponentLoader.idl
index 10598d06131e..1220fdac0fe5 100644
--- a/offapi/com/sun/star/frame/XComponentLoader.idl
+++ b/offapi/com/sun/star/frame/XComponentLoader.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XComponentLoader_idl__
#define __com_sun_star_frame_XComponentLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentRegistry.idl b/offapi/com/sun/star/frame/XComponentRegistry.idl
index 9a9f32541b7b..020d84848724 100644
--- a/offapi/com/sun/star/frame/XComponentRegistry.idl
+++ b/offapi/com/sun/star/frame/XComponentRegistry.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XComponentRegistry_idl__
#define __com_sun_star_frame_XComponentRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
#include <com/sun/star/uno/Uik.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XConfigManager.idl b/offapi/com/sun/star/frame/XConfigManager.idl
index d46cf5696478..02a078a00f04 100644
--- a/offapi/com/sun/star/frame/XConfigManager.idl
+++ b/offapi/com/sun/star/frame/XConfigManager.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XConfigManager_idl__
#define __com_sun_star_frame_XConfigManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index c395bfcf39a1..b39de77b5c36 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XControlNotificationListener_idl__
#define __com_sun_star_frame_XControlNotificationListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_ControlEvent_idl__
#include <com/sun/star/frame/ControlEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XController.idl b/offapi/com/sun/star/frame/XController.idl
index 50d58246fb1a..3ec12169f3d8 100644
--- a/offapi/com/sun/star/frame/XController.idl
+++ b/offapi/com/sun/star/frame/XController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XController_idl__
#define __com_sun_star_frame_XController_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XControllerBorder.idl b/offapi/com/sun/star/frame/XControllerBorder.idl
index 9f8659ee8da9..dd7686a9cd0b 100644
--- a/offapi/com/sun/star/frame/XControllerBorder.idl
+++ b/offapi/com/sun/star/frame/XControllerBorder.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XControllerBorder_idl__
#define __com_sun_star_frame_XControllerBorder_idl__
-#ifndef __com_sun_star_frame_BorderWidths_idl__
#include <com/sun/star/frame/BorderWidths.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
#include <com/sun/star/frame/XBorderResizeListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktop.idl b/offapi/com/sun/star/frame/XDesktop.idl
index f054a90584d1..b5cb7b8de11d 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XDesktop_idl__
#define __com_sun_star_frame_XDesktop_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
#include <com/sun/star/frame/XTerminateListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktopTask.idl b/offapi/com/sun/star/frame/XDesktopTask.idl
index 7a1c3cdbc436..f4558286507a 100644
--- a/offapi/com/sun/star/frame/XDesktopTask.idl
+++ b/offapi/com/sun/star/frame/XDesktopTask.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDesktopTask_idl__
#define __com_sun_star_frame_XDesktopTask_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatch.idl b/offapi/com/sun/star/frame/XDispatch.idl
index b6df12b6cd51..cbecdbfc4f7a 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XDispatch_idl__
#define __com_sun_star_frame_XDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
#include <com/sun/star/frame/XStatusListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 7d58677c19b7..8816a980bb08 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchHelper_idl__
#define __com_sun_star_frame_XDispatchHelper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index a7f50d78c79c..418d6076caa0 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
#define __com_sun_star_frame_XDispatchInformationProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchInformation_idl__
#include <com/sun/star/frame/DispatchInformation.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProvider.idl b/offapi/com/sun/star/frame/XDispatchProvider.idl
index 8197d272a119..7182a23f9296 100644
--- a/offapi/com/sun/star/frame/XDispatchProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchProvider.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#define __com_sun_star_frame_XDispatchProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
#include <com/sun/star/frame/DispatchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
index da55df5c9e3b..b55b8029caf4 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
#define __com_sun_star_frame_XDispatchProviderInterception_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
#include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
index 3b1ee2c16f71..076c459ee0b6 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
#define __com_sun_star_frame_XDispatchProviderInterceptor_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index c0c9b594d38b..00b0b06d81a4 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#define __com_sun_star_frame_XDispatchRecorder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index ccb9204680b0..2330e4603c03 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
#define __com_sun_star_frame_XDispatchRecorderSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchResultListener.idl b/offapi/com/sun/star/frame/XDispatchResultListener.idl
index 409bd4e0206e..48276d1bb1b3 100644
--- a/offapi/com/sun/star/frame/XDispatchResultListener.idl
+++ b/offapi/com/sun/star/frame/XDispatchResultListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
#define __com_sun_star_frame_XDispatchResultListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
#include <com/sun/star/frame/DispatchResultEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XDocumentTemplates.idl b/offapi/com/sun/star/frame/XDocumentTemplates.idl
index 2e327f243da7..38f7b2f89bdb 100644
--- a/offapi/com/sun/star/frame/XDocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/XDocumentTemplates.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
#define __com_sun_star_frame_XDocumentTemplates_idl__
-#ifndef __com_sun_star_frame_XStorable_idl__
#include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
index b51feda6d406..a5a725d8803c 100644
--- a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XExtendedFilterDetection_idl__
#define __com_sun_star_frame_XExtendedFilterDetection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XFilterDetect.idl b/offapi/com/sun/star/frame/XFilterDetect.idl
index 5add9f5e34e9..95edf2d659ee 100644
--- a/offapi/com/sun/star/frame/XFilterDetect.idl
+++ b/offapi/com/sun/star/frame/XFilterDetect.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFilterDetect_idl__
#define __com_sun_star_frame_XFilterDetect_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrame.idl b/offapi/com/sun/star/frame/XFrame.idl
index 5b9ba31f38bf..29ab70b1f527 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrame_idl__
#define __com_sun_star_frame_XFrame_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameActionListener.idl b/offapi/com/sun/star/frame/XFrameActionListener.idl
index 52f87f960113..27e8f54c8048 100644
--- a/offapi/com/sun/star/frame/XFrameActionListener.idl
+++ b/offapi/com/sun/star/frame/XFrameActionListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrameActionListener_idl__
#define __com_sun_star_frame_XFrameActionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameActionEvent_idl__
#include <com/sun/star/frame/FrameActionEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoader.idl b/offapi/com/sun/star/frame/XFrameLoader.idl
index 305313b6472d..f050f512a0d0 100644
--- a/offapi/com/sun/star/frame/XFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XFrameLoader.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XFrameLoader_idl__
#define __com_sun_star_frame_XFrameLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLoadEventListener_idl__
#include <com/sun/star/frame/XLoadEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
index 370386cc73e3..7cca75ab61f0 100644
--- a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
+++ b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XFrameLoaderQuery_idl__
#define __com_sun_star_frame_XFrameLoaderQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameSetModel.idl b/offapi/com/sun/star/frame/XFrameSetModel.idl
index d5baf6f86466..3f3dfec64ade 100644
--- a/offapi/com/sun/star/frame/XFrameSetModel.idl
+++ b/offapi/com/sun/star/frame/XFrameSetModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFrameSetModel_idl__
#define __com_sun_star_frame_XFrameSetModel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrames.idl b/offapi/com/sun/star/frame/XFrames.idl
index 42a7b0eb35e8..ba13b0a71c70 100644
--- a/offapi/com/sun/star/frame/XFrames.idl
+++ b/offapi/com/sun/star/frame/XFrames.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XFrames_idl__
#define __com_sun_star_frame_XFrames_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XFramesSupplier.idl b/offapi/com/sun/star/frame/XFramesSupplier.idl
index 6674693e8fe2..c1c44066132b 100644
--- a/offapi/com/sun/star/frame/XFramesSupplier.idl
+++ b/offapi/com/sun/star/frame/XFramesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XFramesSupplier_idl__
#define __com_sun_star_frame_XFramesSupplier_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index fa2d8944f878..7748350da171 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XInplaceLayout_idl__
#define __com_sun_star_frame_XInplaceLayout_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XInterceptorInfo.idl b/offapi/com/sun/star/frame/XInterceptorInfo.idl
index e451b16d45b2..e3cf7a4df622 100644
--- a/offapi/com/sun/star/frame/XInterceptorInfo.idl
+++ b/offapi/com/sun/star/frame/XInterceptorInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XInterceptorInfo_idl__
#define __com_sun_star_frame_XInterceptorInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index b0902aa4c0e9..305751b1ff9f 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -28,37 +28,14 @@
#ifndef __com_sun_star_frame_XLayoutManager_idl__
#define __com_sun_star_frame_XLayoutManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElement_idl__
#include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_DockingArea_idl__
#include <com/sun/star/ui/DockingArea.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
#include <com/sun/star/ui/XDockingAreaAcceptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index fc7636e21e56..86ee594e9661 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
#define __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
-#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
#include <com/sun/star/frame/XLayoutManagerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 12b9af7ffb9f..2eca6d021143 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
#define __com_sun_star_frame_XLayoutManagerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLoadEventListener.idl b/offapi/com/sun/star/frame/XLoadEventListener.idl
index ab2dca90325f..8169d122a132 100644
--- a/offapi/com/sun/star/frame/XLoadEventListener.idl
+++ b/offapi/com/sun/star/frame/XLoadEventListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XLoadEventListener_idl__
#define __com_sun_star_frame_XLoadEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index 073ca9a55f34..98a3df9c96c4 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XLoadable_idl__
#define __com_sun_star_frame_XLoadable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
#include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index a5c2f54676d8..50bcbf2fed33 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_LayoutManager_idl__
#define __com_sun_star_frame_LayoutManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
#include <com/sun/star/awt/XMenuBar.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index 500c069006ee..4d01fd2ddf12 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
#define __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XModel.idl b/offapi/com/sun/star/frame/XModel.idl
index 1f1b3df870b5..245f41dc737e 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_frame_XModel_idl__
#define __com_sun_star_frame_XModel_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index ed591fb7316a..77ed1335b032 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_frame_XModule_idl__
#define __com_sun_star_frame_XModule_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_frame_UnknownModuleException_idl__
#include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index cdc9bba41b6e..a494586178b6 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_frame_XModuleManager_idl__
#define __com_sun_star_frame_XModuleManager_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_frame_UnknownModuleException_idl__
#include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
//===============================================
diff --git a/offapi/com/sun/star/frame/XNotifyingDispatch.idl b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
index 2d1a9bbc203d..7a1ac504dcdc 100644
--- a/offapi/com/sun/star/frame/XNotifyingDispatch.idl
+++ b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
#define __com_sun_star_frame_XNotifyingDispatch_idl__
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
#include <com/sun/star/frame/XDispatchResultListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index fd9e3b4c2f2e..c22d7ef6280c 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XPopupMenuController_idl__
#define __com_sun_star_frame_XPopupMenuController_idl__
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/XPopupMenu.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 95c7a9cf1ede..e8230278ec7a 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XRecordableDispatch_idl__
#define __com_sun_star_frame_XRecordableDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
#include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSessionManagerClient.idl b/offapi/com/sun/star/frame/XSessionManagerClient.idl
index 8d1f51d4632a..5609389a4e2b 100644
--- a/offapi/com/sun/star/frame/XSessionManagerClient.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerClient.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
#define __com_sun_star_frame_XSessionManagerClient_idl__
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener.idl b/offapi/com/sun/star/frame/XSessionManagerListener.idl
index 2ee33c160240..2b3d00d5f1b3 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#define __com_sun_star_frame_XSessionManagerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 233b7614ad2e..87a988bc2b5e 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener2.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XSessionManagerListener2_idl__
#define __com_sun_star_frame_XSessionManagerListener2_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
#include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
//=============================================================================
module com { module sun { module star { module frame {
diff --git a/offapi/com/sun/star/frame/XStatusListener.idl b/offapi/com/sun/star/frame/XStatusListener.idl
index 250e22c2141d..f67d6a91c0cb 100644
--- a/offapi/com/sun/star/frame/XStatusListener.idl
+++ b/offapi/com/sun/star/frame/XStatusListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XStatusListener_idl__
#define __com_sun_star_frame_XStatusListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
#include <com/sun/star/frame/FeatureStateEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index d524cb75acc6..22211830dfde 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XStatusbarController_idl__
#define __com_sun_star_frame_XStatusbarController_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XGraphics_idl__
#include <com/sun/star/awt/XGraphics.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl
index fa41f3a37f66..094b4a5fb0d6 100644
--- a/offapi/com/sun/star/frame/XStorable.idl
+++ b/offapi/com/sun/star/frame/XStorable.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XStorable_idl__
#define __com_sun_star_frame_XStorable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl
index 20043f2c5eaf..e2ee330f7606 100644
--- a/offapi/com/sun/star/frame/XStorable2.idl
+++ b/offapi/com/sun/star/frame/XStorable2.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XStorable2_idl__
#define __com_sun_star_frame_XStorable2_idl__
-#ifndef __com_sun_star_frame_XStorable_idl__
#include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index a9614e5ba04a..fdbe019edb95 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XSubToolbarController_idl__
#define __com_sun_star_frame_XSubToolbarController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index daa86152ac11..ff8e21463017 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XSynchronousDispatch_idl__
#define __com_sun_star_frame_XSynchronousDispatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
index 5a8a723089c8..d60ffa0c392c 100644
--- a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
#define __com_sun_star_frame_XSynchronousFrameLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTask.idl b/offapi/com/sun/star/frame/XTask.idl
index f0a59b25bcb0..a2dca9d7bc81 100644
--- a/offapi/com/sun/star/frame/XTask.idl
+++ b/offapi/com/sun/star/frame/XTask.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XTask_idl__
#define __com_sun_star_frame_XTask_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
#include <com/sun/star/frame/XFrame.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTasksSupplier.idl b/offapi/com/sun/star/frame/XTasksSupplier.idl
index deb1b3cbb757..2eae9ef31598 100644
--- a/offapi/com/sun/star/frame/XTasksSupplier.idl
+++ b/offapi/com/sun/star/frame/XTasksSupplier.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XTasksSupplier_idl__
#define __com_sun_star_frame_XTasksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
#include <com/sun/star/frame/XTask.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener.idl b/offapi/com/sun/star/frame/XTerminateListener.idl
index 937e3523817b..60896f11dfae 100644
--- a/offapi/com/sun/star/frame/XTerminateListener.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_frame_XTerminateListener_idl__
#define __com_sun_star_frame_XTerminateListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
#include <com/sun/star/frame/TerminationVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener2.idl b/offapi/com/sun/star/frame/XTerminateListener2.idl
index dfeb50fbc93e..d57c21fedc3d 100644
--- a/offapi/com/sun/star/frame/XTerminateListener2.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XTerminateListener2_idl__
#define __com_sun_star_frame_XTerminateListener2_idl__
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
#include <com/sun/star/frame/XTerminateListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 0ce06aecb8f0..d7824625fb76 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitle_idl__
#define __com_sun_star_frame_XTitle_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
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
index 3bc851f4a557..03d70c0db3ce 100644
--- a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitleChangeBroadcaster_idl__
#define __com_sun_star_frame_XTitleChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
#include <com/sun/star/frame/XTitleChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTitleChangeListener.idl b/offapi/com/sun/star/frame/XTitleChangeListener.idl
index 8d1c4c1d8019..35e2286a511f 100644
--- a/offapi/com/sun/star/frame/XTitleChangeListener.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
#define __com_sun_star_frame_XTitleChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
#include <com/sun/star/frame/TitleChangedEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 834cb5d8c84a..623d8a517a31 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XToolbarController_idl__
#define __com_sun_star_frame_XToolbarController_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyModifier_idl__
#include <com/sun/star/awt/KeyModifier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index 9fc7172fd203..f8b67e4c3016 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
#define __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index bd880306b7bb..64553913ce0e 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
#define __com_sun_star_frame_XUIControllerRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 3cace083a209..595a0ac224df 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_frame_XUntitledNumbers_idl__
#define __com_sun_star_frame_XUntitledNumbers_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
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XUrlList.idl b/offapi/com/sun/star/frame/XUrlList.idl
index d4005ded9cd2..af6d35e104ee 100644
--- a/offapi/com/sun/star/frame/XUrlList.idl
+++ b/offapi/com/sun/star/frame/XUrlList.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XUrlList_idl__
#define __com_sun_star_frame_XUrlList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/frame/XWindowArranger.idl b/offapi/com/sun/star/frame/XWindowArranger.idl
index ed5044b9d5aa..4ebbaa0538e6 100644
--- a/offapi/com/sun/star/frame/XWindowArranger.idl
+++ b/offapi/com/sun/star/frame/XWindowArranger.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_frame_XWindowArranger_idl__
#define __com_sun_star_frame_XWindowArranger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================