summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-03-26 22:57:30 +0100
committerJulien Nabet <serval2412@yahoo.fr>2011-03-26 22:57:30 +0100
commit65c4776197e64b8bcd04b9580e27863cad79baa9 (patch)
treee9ddefbc76268c60f430f37f2392e80ad9cb9acb
parentab85bed60128ab33bd62a57f7ffe80e7864c7aa9 (diff)
Strip include guards in idl files in ure/udkapi
-rw-r--r--udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl5
-rw-r--r--udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl5
-rw-r--r--udkapi/com/sun/star/beans/IllegalTypeException.idl2
-rw-r--r--udkapi/com/sun/star/beans/Introspection.idl2
-rw-r--r--udkapi/com/sun/star/beans/IntrospectionException.idl2
-rw-r--r--udkapi/com/sun/star/beans/NotRemoveableException.idl2
-rw-r--r--udkapi/com/sun/star/beans/Property.idl2
-rw-r--r--udkapi/com/sun/star/beans/PropertyBag.idl6
-rw-r--r--udkapi/com/sun/star/beans/PropertyChangeEvent.idl2
-rw-r--r--udkapi/com/sun/star/beans/PropertyExistException.idl2
-rw-r--r--udkapi/com/sun/star/beans/PropertySet.idl10
-rw-r--r--udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl2
-rw-r--r--udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl4
-rw-r--r--udkapi/com/sun/star/beans/PropertyValue.idl4
-rw-r--r--udkapi/com/sun/star/beans/PropertyValues.idl2
-rw-r--r--udkapi/com/sun/star/beans/PropertyVetoException.idl2
-rw-r--r--udkapi/com/sun/star/beans/UnknownPropertyException.idl2
-rw-r--r--udkapi/com/sun/star/beans/XExactName.idl2
-rw-r--r--udkapi/com/sun/star/beans/XFastPropertySet.idl10
-rw-r--r--udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl12
-rw-r--r--udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl8
-rw-r--r--udkapi/com/sun/star/beans/XIntroTest.idl11
-rw-r--r--udkapi/com/sun/star/beans/XIntrospection.idl4
-rw-r--r--udkapi/com/sun/star/beans/XIntrospectionAccess.idl14
-rw-r--r--udkapi/com/sun/star/beans/XMaterialHolder.idl2
-rw-r--r--udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl10
-rw-r--r--udkapi/com/sun/star/beans/XMultiPropertySet.idl12
-rw-r--r--udkapi/com/sun/star/beans/XMultiPropertyStates.idl14
-rw-r--r--udkapi/com/sun/star/beans/XPropertiesChangeListener.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl4
-rw-r--r--udkapi/com/sun/star/beans/XProperty.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertyAccess.idl12
-rw-r--r--udkapi/com/sun/star/beans/XPropertyChangeListener.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertyContainer.idl14
-rw-r--r--udkapi/com/sun/star/beans/XPropertySet.idl16
-rw-r--r--udkapi/com/sun/star/beans/XPropertySetInfo.idl6
-rw-r--r--udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertyState.idl10
-rw-r--r--udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl4
-rw-r--r--udkapi/com/sun/star/beans/XPropertyWithState.idl6
-rw-r--r--udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl14
-rw-r--r--udkapi/com/sun/star/beans/XVetoableChangeListener.idl6
-rw-r--r--udkapi/com/sun/star/bridge/Bridge.idl5
-rw-r--r--udkapi/com/sun/star/bridge/BridgeFactory.idl2
-rw-r--r--udkapi/com/sun/star/bridge/IiopBridge.idl5
-rw-r--r--udkapi/com/sun/star/bridge/OleApplicationRegistration.idl2
-rw-r--r--udkapi/com/sun/star/bridge/OleBridgeSupplier.idl2
-rw-r--r--udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl2
-rw-r--r--udkapi/com/sun/star/bridge/OleObjectFactory.idl2
-rw-r--r--udkapi/com/sun/star/bridge/UrpBridge.idl5
-rw-r--r--udkapi/com/sun/star/bridge/XBridgeSupplier.idl6
-rw-r--r--udkapi/com/sun/star/bridge/XBridgeSupplier2.idl4
-rw-r--r--udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl2
-rw-r--r--udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl2
-rw-r--r--udkapi/com/sun/star/bridge/oleautomation/Factory.idl2
-rw-r--r--udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl2
-rw-r--r--udkapi/com/sun/star/container/ContainerEvent.idl2
-rw-r--r--udkapi/com/sun/star/container/ElementExistException.idl2
-rw-r--r--udkapi/com/sun/star/container/NoSuchElementException.idl2
-rw-r--r--udkapi/com/sun/star/container/XChild.idl4
-rw-r--r--udkapi/com/sun/star/container/XComponentEnumeration.idl6
-rw-r--r--udkapi/com/sun/star/container/XComponentEnumerationAccess.idl4
-rw-r--r--udkapi/com/sun/star/container/XContainer.idl4
-rw-r--r--udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl2
-rw-r--r--udkapi/com/sun/star/container/XContainerApproveListener.idl8
-rw-r--r--udkapi/com/sun/star/container/XContainerListener.idl4
-rw-r--r--udkapi/com/sun/star/container/XContainerQuery.idl8
-rw-r--r--udkapi/com/sun/star/container/XContentEnumerationAccess.idl4
-rw-r--r--udkapi/com/sun/star/container/XElementAccess.idl4
-rw-r--r--udkapi/com/sun/star/container/XEnumeration.idl6
-rw-r--r--udkapi/com/sun/star/container/XEnumerationAccess.idl4
-rw-r--r--udkapi/com/sun/star/container/XHierarchicalName.idl6
-rw-r--r--udkapi/com/sun/star/container/XHierarchicalNameAccess.idl4
-rw-r--r--udkapi/com/sun/star/container/XHierarchicalNameContainer.idl14
-rw-r--r--udkapi/com/sun/star/container/XHierarchicalNameReplace.idl11
-rw-r--r--udkapi/com/sun/star/container/XIdentifierAccess.idl6
-rw-r--r--udkapi/com/sun/star/container/XIdentifierContainer.idl10
-rw-r--r--udkapi/com/sun/star/container/XIdentifierReplace.idl8
-rw-r--r--udkapi/com/sun/star/container/XImplicitIDAccess.idl6
-rw-r--r--udkapi/com/sun/star/container/XImplicitIDContainer.idl6
-rw-r--r--udkapi/com/sun/star/container/XImplicitIDReplace.idl6
-rw-r--r--udkapi/com/sun/star/container/XIndexAccess.idl6
-rw-r--r--udkapi/com/sun/star/container/XIndexContainer.idl8
-rw-r--r--udkapi/com/sun/star/container/XIndexReplace.idl8
-rw-r--r--udkapi/com/sun/star/container/XNameAccess.idl6
-rw-r--r--udkapi/com/sun/star/container/XNameContainer.idl10
-rw-r--r--udkapi/com/sun/star/container/XNameReplace.idl8
-rw-r--r--udkapi/com/sun/star/container/XNamed.idl2
-rw-r--r--udkapi/com/sun/star/container/XSet.idl8
-rw-r--r--udkapi/com/sun/star/container/XStringKeyMap.idl14
-rw-r--r--udkapi/com/sun/star/container/XUniqueIDAccess.idl6
-rw-r--r--udkapi/com/sun/star/corba/giop/giop.idl5
-rw-r--r--udkapi/com/sun/star/corba/iiop/iiop.idl5
-rw-r--r--udkapi/com/sun/star/corba/iop/iop.idl5
-rw-r--r--udkapi/com/sun/star/io/AlreadyConnectedException.idl2
-rw-r--r--udkapi/com/sun/star/io/BufferSizeExceededException.idl2
-rw-r--r--udkapi/com/sun/star/io/ConnectException.idl2
-rw-r--r--udkapi/com/sun/star/io/DataInputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/DataOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/DataTransferEvent.idl2
-rw-r--r--udkapi/com/sun/star/io/IOException.idl2
-rw-r--r--udkapi/com/sun/star/io/MarkableInputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/MarkableOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/NoRouteToHostException.idl2
-rw-r--r--udkapi/com/sun/star/io/NotConnectedException.idl2
-rw-r--r--udkapi/com/sun/star/io/ObjectInputStream.idl8
-rw-r--r--udkapi/com/sun/star/io/ObjectOutputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/Pipe.idl4
-rw-r--r--udkapi/com/sun/star/io/Pump.idl6
-rw-r--r--udkapi/com/sun/star/io/SequenceInputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/SequenceOutputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/SocketException.idl2
-rw-r--r--udkapi/com/sun/star/io/TempFile.idl2
-rw-r--r--udkapi/com/sun/star/io/TextInputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/TextOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/UnexpectedEOFException.idl2
-rw-r--r--udkapi/com/sun/star/io/UnknownHostException.idl2
-rw-r--r--udkapi/com/sun/star/io/WrongFormatException.idl2
-rw-r--r--udkapi/com/sun/star/io/XActiveDataControl.idl4
-rw-r--r--udkapi/com/sun/star/io/XActiveDataSink.idl4
-rw-r--r--udkapi/com/sun/star/io/XActiveDataSource.idl4
-rw-r--r--udkapi/com/sun/star/io/XActiveDataStreamer.idl4
-rw-r--r--udkapi/com/sun/star/io/XAsyncOutputMonitor.idl4
-rw-r--r--udkapi/com/sun/star/io/XConnectable.idl2
-rw-r--r--udkapi/com/sun/star/io/XDataExporter.idl8
-rw-r--r--udkapi/com/sun/star/io/XDataImporter.idl8
-rw-r--r--udkapi/com/sun/star/io/XDataInputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XDataOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XDataTransferEventListener.idl4
-rw-r--r--udkapi/com/sun/star/io/XInputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/XInputStreamProvider.idl2
-rw-r--r--udkapi/com/sun/star/io/XMarkableStream.idl6
-rw-r--r--udkapi/com/sun/star/io/XObjectInputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/XObjectOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XOutputStream.idl6
-rw-r--r--udkapi/com/sun/star/io/XPersist.idl4
-rw-r--r--udkapi/com/sun/star/io/XPersistObject.idl4
-rw-r--r--udkapi/com/sun/star/io/XSeekable.idl6
-rw-r--r--udkapi/com/sun/star/io/XSeekableInputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XSequenceOutputStream.idl8
-rw-r--r--udkapi/com/sun/star/io/XStream.idl7
-rw-r--r--udkapi/com/sun/star/io/XStreamListener.idl2
-rw-r--r--udkapi/com/sun/star/io/XTempFile.idl8
-rw-r--r--udkapi/com/sun/star/io/XTextInputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XTextOutputStream.idl4
-rw-r--r--udkapi/com/sun/star/io/XTruncate.idl5
-rw-r--r--udkapi/com/sun/star/io/XXMLExtractor.idl5
-rw-r--r--[-rwxr-xr-x]udkapi/com/sun/star/java/InvalidJavaSettingsException.idl2
-rw-r--r--udkapi/com/sun/star/java/JavaDisabledException.idl2
-rw-r--r--udkapi/com/sun/star/java/JavaInitializationException.idl2
-rw-r--r--udkapi/com/sun/star/java/JavaNotConfiguredException.idl2
-rw-r--r--udkapi/com/sun/star/java/JavaNotFoundException.idl2
-rw-r--r--udkapi/com/sun/star/java/JavaVMCreationFailureException.idl2
-rw-r--r--udkapi/com/sun/star/java/MissingJavaRuntimeException.idl2
-rw-r--r--[-rwxr-xr-x]udkapi/com/sun/star/java/RestartRequiredException.idl2
-rw-r--r--udkapi/com/sun/star/java/WrongJavaVersionException.idl2
-rw-r--r--udkapi/com/sun/star/java/XJavaThreadRegister_11.idl2
-rw-r--r--udkapi/com/sun/star/java/XJavaVM.idl2
-rw-r--r--udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl2
-rw-r--r--udkapi/com/sun/star/lang/ClassNotFoundException.idl2
-rw-r--r--udkapi/com/sun/star/lang/DisposedException.idl2
-rw-r--r--udkapi/com/sun/star/lang/EventObject.idl2
-rw-r--r--udkapi/com/sun/star/lang/IllegalAccessException.idl2
-rw-r--r--udkapi/com/sun/star/lang/IllegalArgumentException.idl2
-rw-r--r--udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl2
-rw-r--r--udkapi/com/sun/star/lang/InvalidListenerException.idl2
-rw-r--r--udkapi/com/sun/star/lang/ListenerExistException.idl2
-rw-r--r--udkapi/com/sun/star/lang/MultiServiceFactory.idl6
-rw-r--r--udkapi/com/sun/star/lang/NoSuchFieldException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NoSuchMethodException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NoSupportException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NotInitializedException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NullPointerException.idl2
-rw-r--r--udkapi/com/sun/star/lang/RegistryServiceManager.idl10
-rw-r--r--udkapi/com/sun/star/lang/ServiceManager.idl17
-rw-r--r--udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl2
-rw-r--r--udkapi/com/sun/star/lang/WrappedTargetException.idl2
-rw-r--r--udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl2
-rw-r--r--udkapi/com/sun/star/lang/XComponent.idl2
-rw-r--r--udkapi/com/sun/star/lang/XConnectionPoint.idl9
-rw-r--r--udkapi/com/sun/star/lang/XConnectionPointContainer.idl2
-rw-r--r--udkapi/com/sun/star/lang/XEventListener.idl4
-rw-r--r--udkapi/com/sun/star/lang/XInitialization.idl4
-rw-r--r--udkapi/com/sun/star/lang/XLocalizable.idl4
-rw-r--r--udkapi/com/sun/star/lang/XMain.idl4
-rw-r--r--udkapi/com/sun/star/lang/XMultiComponentFactory.idl2
-rw-r--r--udkapi/com/sun/star/lang/XMultiServiceFactory.idl4
-rw-r--r--udkapi/com/sun/star/lang/XServiceDisplayName.idl4
-rw-r--r--udkapi/com/sun/star/lang/XServiceInfo.idl2
-rw-r--r--udkapi/com/sun/star/lang/XServiceName.idl2
-rw-r--r--udkapi/com/sun/star/lang/XSingleComponentFactory.idl2
-rw-r--r--udkapi/com/sun/star/lang/XSingleServiceFactory.idl4
-rw-r--r--udkapi/com/sun/star/lang/XTypeProvider.idl4
-rw-r--r--udkapi/com/sun/star/lang/XUnoTunnel.idl2
-rw-r--r--udkapi/com/sun/star/loader/CannotActivateFactoryException.idl2
-rw-r--r--udkapi/com/sun/star/loader/Java2.idl2
-rw-r--r--udkapi/com/sun/star/loader/XImplementationLoader.idl8
-rw-r--r--udkapi/com/sun/star/reflection/CoreReflection.idl5
-rw-r--r--udkapi/com/sun/star/reflection/InvalidTypeNameException.idl2
-rw-r--r--udkapi/com/sun/star/reflection/InvocationTargetException.idl2
-rw-r--r--udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl2
-rw-r--r--udkapi/com/sun/star/reflection/ParamInfo.idl2
-rw-r--r--udkapi/com/sun/star/reflection/ProxyFactory.idl2
-rw-r--r--udkapi/com/sun/star/reflection/TypeDescriptionManager.idl14
-rw-r--r--udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl8
-rw-r--r--udkapi/com/sun/star/reflection/XArrayTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XConstantTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl5
-rw-r--r--udkapi/com/sun/star/reflection/XEnumTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XIdlArray.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XIdlClass.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XIdlClassProvider.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XIdlField.idl10
-rw-r--r--udkapi/com/sun/star/reflection/XIdlField2.idl10
-rw-r--r--udkapi/com/sun/star/reflection/XIdlMember.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XIdlMethod.idl10
-rw-r--r--udkapi/com/sun/star/reflection/XIdlReflection.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XMethodParameter.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XModuleTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/reflection/XProxyFactory.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XServiceTypeDescription.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl5
-rw-r--r--udkapi/com/sun/star/reflection/XTypeDescription.idl4
-rw-r--r--udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl6
-rw-r--r--udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl10
-rw-r--r--udkapi/com/sun/star/reflection/XUnionTypeDescription.idl2
-rw-r--r--udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl2
-rw-r--r--udkapi/com/sun/star/registry/DefaultRegistry.idl2
-rw-r--r--udkapi/com/sun/star/registry/ImplementationRegistration.idl2
-rw-r--r--udkapi/com/sun/star/registry/InvalidRegistryException.idl2
-rw-r--r--udkapi/com/sun/star/registry/InvalidValueException.idl2
-rw-r--r--udkapi/com/sun/star/registry/MergeConflictException.idl2
-rw-r--r--udkapi/com/sun/star/registry/NestedRegistry.idl4
-rw-r--r--udkapi/com/sun/star/registry/SimpleRegistry.idl2
-rw-r--r--udkapi/com/sun/star/registry/XImplementationRegistration.idl6
-rw-r--r--udkapi/com/sun/star/registry/XImplementationRegistration2.idl2
-rw-r--r--udkapi/com/sun/star/registry/XRegistryKey.idl14
-rw-r--r--udkapi/com/sun/star/registry/XSimpleRegistry.idl11
-rw-r--r--udkapi/com/sun/star/script/AllEventObject.idl4
-rw-r--r--udkapi/com/sun/star/script/AllListenerAdapter.idl2
-rw-r--r--udkapi/com/sun/star/script/ArrayWrapper.idl2
-rw-r--r--udkapi/com/sun/star/script/BasicErrorException.idl2
-rw-r--r--udkapi/com/sun/star/script/CannotConvertException.idl4
-rw-r--r--udkapi/com/sun/star/script/CannotCreateAdapterException.idl2
-rw-r--r--udkapi/com/sun/star/script/Converter.idl2
-rw-r--r--udkapi/com/sun/star/script/Engine.idl2
-rw-r--r--udkapi/com/sun/star/script/FinishEngineEvent.idl4
-rw-r--r--udkapi/com/sun/star/script/InterruptEngineEvent.idl4
-rw-r--r--udkapi/com/sun/star/script/Invocation.idl2
-rw-r--r--udkapi/com/sun/star/script/InvocationAdapterFactory.idl4
-rw-r--r--udkapi/com/sun/star/script/InvocationInfo.idl4
-rw-r--r--udkapi/com/sun/star/script/JavaScript.idl2
-rw-r--r--udkapi/com/sun/star/script/ScriptEvent.idl2
-rw-r--r--udkapi/com/sun/star/script/XAllListener.idl6
-rw-r--r--udkapi/com/sun/star/script/XAllListenerAdapterService.idl6
-rw-r--r--udkapi/com/sun/star/script/XAutomationInvocation.idl2
-rw-r--r--udkapi/com/sun/star/script/XDebugging.idl4
-rw-r--r--udkapi/com/sun/star/script/XDefaultMethod.idl2
-rw-r--r--udkapi/com/sun/star/script/XDefaultProperty.idl2
-rw-r--r--udkapi/com/sun/star/script/XDirectInvocation.idl10
-rw-r--r--udkapi/com/sun/star/script/XEngine.idl6
-rw-r--r--udkapi/com/sun/star/script/XEngineListener.idl8
-rw-r--r--udkapi/com/sun/star/script/XErrorQuery.idl2
-rw-r--r--udkapi/com/sun/star/script/XEventAttacher.idl14
-rw-r--r--udkapi/com/sun/star/script/XEventAttacherManager.idl10
-rw-r--r--udkapi/com/sun/star/script/XInvocation.idl12
-rw-r--r--udkapi/com/sun/star/script/XInvocation2.idl4
-rw-r--r--udkapi/com/sun/star/script/XInvocationAdapterFactory.idl4
-rw-r--r--udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl4
-rw-r--r--udkapi/com/sun/star/script/XLibraryAccess.idl2
-rw-r--r--udkapi/com/sun/star/script/XScriptEventsAttacher.idl12
-rw-r--r--udkapi/com/sun/star/script/XScriptEventsSupplier.idl4
-rw-r--r--udkapi/com/sun/star/script/XScriptListener.idl6
-rw-r--r--udkapi/com/sun/star/script/XStarBasicAccess.idl2
-rw-r--r--udkapi/com/sun/star/script/XStarBasicDialogInfo.idl2
-rw-r--r--udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl2
-rw-r--r--udkapi/com/sun/star/script/XStarBasicModuleInfo.idl2
-rw-r--r--udkapi/com/sun/star/script/XTypeConverter.idl10
-rw-r--r--udkapi/com/sun/star/security/AccessControlException.idl2
-rw-r--r--udkapi/com/sun/star/security/AccessController.idl2
-rw-r--r--udkapi/com/sun/star/security/Policy.idl2
-rw-r--r--udkapi/com/sun/star/security/XAccessControlContext.idl4
-rw-r--r--udkapi/com/sun/star/security/XAccessController.idl10
-rw-r--r--udkapi/com/sun/star/security/XAction.idl4
-rw-r--r--udkapi/com/sun/star/security/XPolicy.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionAbort.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionContinuation.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionHandler.idl4
-rw-r--r--udkapi/com/sun/star/task/XInteractionHandler2.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionRequest.idl4
-rw-r--r--udkapi/com/sun/star/task/XInteractionRetry.idl2
-rw-r--r--udkapi/com/sun/star/test/TestEvent.idl2
-rw-r--r--udkapi/com/sun/star/test/TestFactory.idl2
-rw-r--r--udkapi/com/sun/star/test/XSimpleTest.idl5
-rw-r--r--udkapi/com/sun/star/test/XTest.idl8
-rw-r--r--udkapi/com/sun/star/test/XTestListener.idl5
-rw-r--r--udkapi/com/sun/star/test/bridge/XBridgeTest.idl5
-rw-r--r--udkapi/com/sun/star/test/performance/XPerformanceTest.idl2
-rw-r--r--udkapi/com/sun/star/uno/DeploymentException.idl2
-rw-r--r--udkapi/com/sun/star/uno/Exception.idl2
-rw-r--r--udkapi/com/sun/star/uno/NamingService.idl2
-rw-r--r--udkapi/com/sun/star/uno/RuntimeException.idl2
-rw-r--r--udkapi/com/sun/star/uno/SecurityException.idl2
-rw-r--r--udkapi/com/sun/star/uno/XAdapter.idl4
-rw-r--r--udkapi/com/sun/star/uno/XAggregation.idl2
-rw-r--r--udkapi/com/sun/star/uno/XComponentContext.idl2
-rw-r--r--udkapi/com/sun/star/uno/XCurrentContext.idl2
-rw-r--r--udkapi/com/sun/star/uno/XNamingService.idl4
-rw-r--r--udkapi/com/sun/star/uno/XReference.idl2
-rw-r--r--udkapi/com/sun/star/uno/XUnloadingPreference.idl2
-rw-r--r--udkapi/com/sun/star/uno/XWeak.idl4
-rw-r--r--udkapi/com/sun/star/util/BootstrapMacroExpander.idl5
-rw-r--r--udkapi/com/sun/star/util/MacroExpander.idl5
-rw-r--r--udkapi/com/sun/star/util/XMacroExpander.idl5
-rw-r--r--udkapi/com/sun/star/util/XVeto.idl2
-rw-r--r--udkapi/com/sun/star/util/logging/Logger.idl8
-rw-r--r--udkapi/com/sun/star/util/logging/LoggerRemote.idl8
-rw-r--r--udkapi/com/sun/star/util/logging/XLogger.idl2
-rw-r--r--udkapi/com/sun/star/util/logging/XLoggerRemote.idl5
327 files changed, 12 insertions, 1452 deletions
diff --git a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
index f12e8d475..04e434f00 100644
--- a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
#define __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
#include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
#include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
index 8be3c3124..596c4b0cb 100644
--- a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
#define __com_sun_star_beans_GetPropertyTolerantResult_idl__
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
#include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/IllegalTypeException.idl b/udkapi/com/sun/star/beans/IllegalTypeException.idl
index 949b92f27..885d13d22 100644
--- a/udkapi/com/sun/star/beans/IllegalTypeException.idl
+++ b/udkapi/com/sun/star/beans/IllegalTypeException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_IllegalTypeException_idl__
#define __com_sun_star_beans_IllegalTypeException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 7aad051c8..6cf61c816 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_Introspection_idl__
#define __com_sun_star_beans_Introspection_idl__
-#ifndef __com_sun_star_beans_XIntrospection_idl__
#include <com/sun/star/beans/XIntrospection.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/IntrospectionException.idl b/udkapi/com/sun/star/beans/IntrospectionException.idl
index 3a9855bec..0aa28b236 100644
--- a/udkapi/com/sun/star/beans/IntrospectionException.idl
+++ b/udkapi/com/sun/star/beans/IntrospectionException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_IntrospectionException_idl__
#define __com_sun_star_beans_IntrospectionException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/NotRemoveableException.idl b/udkapi/com/sun/star/beans/NotRemoveableException.idl
index 096e62980..699340b6b 100644
--- a/udkapi/com/sun/star/beans/NotRemoveableException.idl
+++ b/udkapi/com/sun/star/beans/NotRemoveableException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_NotRemoveableException_idl__
#define __com_sun_star_beans_NotRemoveableException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/Property.idl b/udkapi/com/sun/star/beans/Property.idl
index e28989d20..5ee972b6c 100644
--- a/udkapi/com/sun/star/beans/Property.idl
+++ b/udkapi/com/sun/star/beans/Property.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_Property_idl__
#define __com_sun_star_beans_Property_idl__
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyBag.idl b/udkapi/com/sun/star/beans/PropertyBag.idl
index 5ea8f77c7..08b97a33a 100644
--- a/udkapi/com/sun/star/beans/PropertyBag.idl
+++ b/udkapi/com/sun/star/beans/PropertyBag.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_beans_PropertyBag_idl__
#define __com_sun_star_beans_PropertyBag_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
index 717857667..eac5974a1 100644
--- a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
#define __com_sun_star_beans_PropertyChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyExistException.idl b/udkapi/com/sun/star/beans/PropertyExistException.idl
index 9340451e3..d4f0fc315 100644
--- a/udkapi/com/sun/star/beans/PropertyExistException.idl
+++ b/udkapi/com/sun/star/beans/PropertyExistException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_PropertyExistException_idl__
#define __com_sun_star_beans_PropertyExistException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertySet.idl b/udkapi/com/sun/star/beans/PropertySet.idl
index 90e6e09cd..b3cda6e72 100644
--- a/udkapi/com/sun/star/beans/PropertySet.idl
+++ b/udkapi/com/sun/star/beans/PropertySet.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_beans_PropertySet_idl__
#define __com_sun_star_beans_PropertySet_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
index 6e9bc6b2f..66ad78055 100644
--- a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
#define __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
index 0e02d0fa2..402e6d9d6 100644
--- a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
#define __com_sun_star_beans_PropertyStateChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyValue.idl b/udkapi/com/sun/star/beans/PropertyValue.idl
index d473d335c..0883bafb4 100644
--- a/udkapi/com/sun/star/beans/PropertyValue.idl
+++ b/udkapi/com/sun/star/beans/PropertyValue.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_PropertyValue_idl__
#define __com_sun_star_beans_PropertyValue_idl__
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyValues.idl b/udkapi/com/sun/star/beans/PropertyValues.idl
index 1f22c8275..04b88b82e 100644
--- a/udkapi/com/sun/star/beans/PropertyValues.idl
+++ b/udkapi/com/sun/star/beans/PropertyValues.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_PropertyValues_idl__
#define __com_sun_star_beans_PropertyValues_idl__
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyVetoException.idl b/udkapi/com/sun/star/beans/PropertyVetoException.idl
index 0212eb299..e6616d7a1 100644
--- a/udkapi/com/sun/star/beans/PropertyVetoException.idl
+++ b/udkapi/com/sun/star/beans/PropertyVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#define __com_sun_star_beans_PropertyVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/UnknownPropertyException.idl b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
index b2cd16154..d7ab3e995 100644
--- a/udkapi/com/sun/star/beans/UnknownPropertyException.idl
+++ b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#define __com_sun_star_beans_UnknownPropertyException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XExactName.idl b/udkapi/com/sun/star/beans/XExactName.idl
index 899924599..f476679d9 100644
--- a/udkapi/com/sun/star/beans/XExactName.idl
+++ b/udkapi/com/sun/star/beans/XExactName.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_XExactName_idl__
#define __com_sun_star_beans_XExactName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XFastPropertySet.idl b/udkapi/com/sun/star/beans/XFastPropertySet.idl
index 1534e674a..7c7045e2c 100644
--- a/udkapi/com/sun/star/beans/XFastPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XFastPropertySet.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#define __com_sun_star_beans_XFastPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
index 52e1f13d1..8d56eb4cb 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__
#define __com_sun_star_beans_XHierarchicalPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
index faf9c1112..6412cbf4a 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
#define __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XIntroTest.idl b/udkapi/com/sun/star/beans/XIntroTest.idl
index a48b9839b..94f1e32fb 100644
--- a/udkapi/com/sun/star/beans/XIntroTest.idl
+++ b/udkapi/com/sun/star/beans/XIntroTest.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_beans_XIntroTest_idl__
#define __com_sun_star_beans_XIntroTest_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XIntrospection.idl b/udkapi/com/sun/star/beans/XIntrospection.idl
index 433e16a32..ce2520147 100644
--- a/udkapi/com/sun/star/beans/XIntrospection.idl
+++ b/udkapi/com/sun/star/beans/XIntrospection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XIntrospection_idl__
#define __com_sun_star_beans_XIntrospection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
#include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
index e03b4c77a..6fa1aa9c8 100644
--- a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
+++ b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
#define __com_sun_star_beans_XIntrospectionAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlMethod_idl__
#include <com/sun/star/reflection/XIdlMethod.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSuchMethodException_idl__
#include <com/sun/star/lang/NoSuchMethodException.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
#include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XMaterialHolder.idl b/udkapi/com/sun/star/beans/XMaterialHolder.idl
index cdfc1fc50..394a5cd6c 100644
--- a/udkapi/com/sun/star/beans/XMaterialHolder.idl
+++ b/udkapi/com/sun/star/beans/XMaterialHolder.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_beans_XMaterialHolder_idl__
#define __com_sun_star_beans_XMaterialHolder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
index c7ba2c065..6242cb9e2 100644
--- a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
#define __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XMultiPropertySet.idl b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
index 222f4d44b..5dbbb7820 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#define __com_sun_star_beans_XMultiPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
index decc9a766..28040723d 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
#define __com_sun_star_beans_XMultiPropertyState_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
#include <com/sun/star/beans/XPropertyStateChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
index 7988c1403..ae1182f6e 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
#define __com_sun_star_beans_XPropertiesChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
index d7ff520c0..c7a919713 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
#define __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XProperty.idl b/udkapi/com/sun/star/beans/XProperty.idl
index 5925d471a..bf00ce750 100644
--- a/udkapi/com/sun/star/beans/XProperty.idl
+++ b/udkapi/com/sun/star/beans/XProperty.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XProperty_idl__
#define __com_sun_star_beans_XProperty_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyAccess.idl b/udkapi/com/sun/star/beans/XPropertyAccess.idl
index aabc1085c..5d44a1087 100644
--- a/udkapi/com/sun/star/beans/XPropertyAccess.idl
+++ b/udkapi/com/sun/star/beans/XPropertyAccess.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_beans_XPropertyAccess_idl__
#define __com_sun_star_beans_XPropertyAccess_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
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
index 760389aee..90e49e525 100644
--- a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#define __com_sun_star_beans_XPropertyChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyContainer.idl b/udkapi/com/sun/star/beans/XPropertyContainer.idl
index 91e45bd75..4755a8147 100644
--- a/udkapi/com/sun/star/beans/XPropertyContainer.idl
+++ b/udkapi/com/sun/star/beans/XPropertyContainer.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_beans_XPropertyContainer_idl__
#define __com_sun_star_beans_XPropertyContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyExistException_idl__
#include <com/sun/star/beans/PropertyExistException.idl>
-#endif
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
#include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_NotRemoveableException_idl__
#include <com/sun/star/beans/NotRemoveableException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySet.idl b/udkapi/com/sun/star/beans/XPropertySet.idl
index f8337bba8..58606edca 100644
--- a/udkapi/com/sun/star/beans/XPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XPropertySet.idl
@@ -27,37 +27,21 @@
#ifndef __com_sun_star_beans_XPropertySet_idl__
#define __com_sun_star_beans_XPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
#include <com/sun/star/beans/XVetoableChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfo.idl b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
index d9e0d5aec..78253b1cc 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
#define __com_sun_star_beans_XPropertySetInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
#include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
index 6d2207bd7..80af3a454 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
#define __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
#include <com/sun/star/beans/PropertySetInfoChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
index f08446995..103f68e29 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
#define __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
#include <com/sun/star/beans/XPropertySetInfoChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyState.idl b/udkapi/com/sun/star/beans/XPropertyState.idl
index a6aea62f4..9219bf794 100644
--- a/udkapi/com/sun/star/beans/XPropertyState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyState.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_beans_XPropertyState_idl__
#define __com_sun_star_beans_XPropertyState_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
#include <com/sun/star/beans/XPropertyStateChangeListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
index 612a1a5d7..469dae905 100644
--- a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
#define __com_sun_star_beans_XPropertyStateChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
#include <com/sun/star/beans/PropertyStateChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyWithState.idl b/udkapi/com/sun/star/beans/XPropertyWithState.idl
index 7beb771d8..fcf4e6838 100644
--- a/udkapi/com/sun/star/beans/XPropertyWithState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyWithState.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_beans_XPropertyWithState_idl__
#define __com_sun_star_beans_XPropertyWithState_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
index c55964040..a982dc946 100644
--- a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
@@ -28,25 +28,11 @@
#define __com_sun_star_beans_XTolerantMultiPropertySet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
#include <com/sun/star/beans/GetDirectPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
#include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__
#include <com/sun/star/beans/SetPropertyTolerantFailed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
index f2da84b9a..14be1b7fa 100644
--- a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
#define __com_sun_star_beans_XVetoableChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/Bridge.idl b/udkapi/com/sun/star/bridge/Bridge.idl
index 5764583db..160de6f98 100644
--- a/udkapi/com/sun/star/bridge/Bridge.idl
+++ b/udkapi/com/sun/star/bridge/Bridge.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_bridge_Bridge_idl__
#define __com_sun_star_bridge_Bridge_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
#ifndef __com_sun_star_bridge_XBridge_idl__
#include <com/sun/star/bridge/XBridge.idl>
diff --git a/udkapi/com/sun/star/bridge/BridgeFactory.idl b/udkapi/com/sun/star/bridge/BridgeFactory.idl
index 48eed7078..e956248b6 100644
--- a/udkapi/com/sun/star/bridge/BridgeFactory.idl
+++ b/udkapi/com/sun/star/bridge/BridgeFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_BridgeFactory_idl__
#define __com_sun_star_bridge_BridgeFactory_idl__
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
#ifndef __com_sun_star_bridge_XBridgeFactory_idl__
#include <com/sun/star/bridge/XBridgeFactory.idl>
diff --git a/udkapi/com/sun/star/bridge/IiopBridge.idl b/udkapi/com/sun/star/bridge/IiopBridge.idl
index 21381f64d..754274f32 100644
--- a/udkapi/com/sun/star/bridge/IiopBridge.idl
+++ b/udkapi/com/sun/star/bridge/IiopBridge.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_bridge_Iiop_idl__
#define __com_sun_star_bridge_Iiop_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
#ifndef __com_sun_star_bridge_XBridge_idl__
#include <com/sun/star/bridge/XBridge.idl>
diff --git a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
index cb1505cf2..8b52c15db 100644
--- a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_OleApplicationRegistration_idl__
#define __com_sun_star_bridge_OleApplicationRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
index 9990476d8..efb678f26 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_OleBridgeSupplier_idl__
#define __com_sun_star_bridge_OleBridgeSupplier_idl__
-#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
#include <com/sun/star/bridge/XBridgeSupplier.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
index c14fb0473..4ec4df42e 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_OleBridgeSupplier2_idl__
#define __com_sun_star_bridge_OleBridgeSupplier2_idl__
-#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
#include <com/sun/star/bridge/XBridgeSupplier2.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleObjectFactory.idl b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
index dd388d233..8bbfa5cdb 100644
--- a/udkapi/com/sun/star/bridge/OleObjectFactory.idl
+++ b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_OleObjectFactory_idl__
#define __com_sun_star_bridge_OleObjectFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/UrpBridge.idl b/udkapi/com/sun/star/bridge/UrpBridge.idl
index e9e8ab651..6a70d6f7b 100644
--- a/udkapi/com/sun/star/bridge/UrpBridge.idl
+++ b/udkapi/com/sun/star/bridge/UrpBridge.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_bridge_Urp_idl__
#define __com_sun_star_bridge_Urp_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
#ifndef __com_sun_star_bridge_XBridge_idl__
#include <com/sun/star/bridge/XBridge.idl>
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
index 0bd279e4d..1d3288406 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
#define __com_sun_star_bridge_XBridgeSupplier_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
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
index d0b7380ab..dd74c0d7f 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
#define __com_sun_star_bridge_XBridgeSupplier2_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/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
index 8f6ddb949..ea39f945d 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
#define __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
index 06e1c5233..30541b933 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_oleautomation_BridgeSupplier_idl__
#define __com_sun_star_bridge_oleautomation_BridgeSupplier_idl__
-#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
#include <com/sun/star/bridge/XBridgeSupplier2.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
index 084d05d06..0a2cdcf2e 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_oleautomation_Factory_idl__
#define __com_sun_star_bridge_oleautomation_Factory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
index 4f041bffa..fa479c51a 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
#define __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module bridge { module oleautomation {
diff --git a/udkapi/com/sun/star/container/ContainerEvent.idl b/udkapi/com/sun/star/container/ContainerEvent.idl
index 07b7accbc..d0e58d186 100644
--- a/udkapi/com/sun/star/container/ContainerEvent.idl
+++ b/udkapi/com/sun/star/container/ContainerEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_ContainerEvent_idl__
#define __com_sun_star_container_ContainerEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/ElementExistException.idl b/udkapi/com/sun/star/container/ElementExistException.idl
index 73fb2b1e8..4ae8bc710 100644
--- a/udkapi/com/sun/star/container/ElementExistException.idl
+++ b/udkapi/com/sun/star/container/ElementExistException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_ElementExistException_idl__
#define __com_sun_star_container_ElementExistException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/NoSuchElementException.idl b/udkapi/com/sun/star/container/NoSuchElementException.idl
index 7cf794e93..cc99d6817 100644
--- a/udkapi/com/sun/star/container/NoSuchElementException.idl
+++ b/udkapi/com/sun/star/container/NoSuchElementException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_NoSuchElementException_idl__
#define __com_sun_star_container_NoSuchElementException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XChild.idl b/udkapi/com/sun/star/container/XChild.idl
index c7d705406..ac8b244b3 100644
--- a/udkapi/com/sun/star/container/XChild.idl
+++ b/udkapi/com/sun/star/container/XChild.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XChild_idl__
#define __com_sun_star_container_XChild_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XComponentEnumeration.idl b/udkapi/com/sun/star/container/XComponentEnumeration.idl
index 428d15230..516a84116 100644
--- a/udkapi/com/sun/star/container/XComponentEnumeration.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumeration.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XComponentEnumeration_idl__
#define __com_sun_star_container_XComponentEnumeration_idl__
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
index d572b46a5..7bf8b71dd 100644
--- a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XComponentEnumerationAccess_idl__
#define __com_sun_star_container_XComponentEnumerationAccess_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XComponentEnumeration_idl__
#include <com/sun/star/container/XComponentEnumeration.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainer.idl b/udkapi/com/sun/star/container/XContainer.idl
index c55c8a18b..37da41c0d 100644
--- a/udkapi/com/sun/star/container/XContainer.idl
+++ b/udkapi/com/sun/star/container/XContainer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XContainer_idl__
#define __com_sun_star_container_XContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XContainerListener_idl__
#include <com/sun/star/container/XContainerListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
index 078aaa94b..61522a1d9 100644
--- a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_container_XContainerApproveBroadcaster_idl__
#define __com_sun_star_container_XContainerApproveBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerApproveListener.idl b/udkapi/com/sun/star/container/XContainerApproveListener.idl
index 41692dc16..edfc405ca 100644
--- a/udkapi/com/sun/star/container/XContainerApproveListener.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveListener.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_container_XContainerApproveListener_idl
#define __com_sun_star_container_XContainerApproveListener_idl
-#ifndef __com_sun_star_container_ContainerEvent_idl__
#include <com/sun/star/container/ContainerEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XVeto_idl__
#include <com/sun/star/util/XVeto.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerListener.idl b/udkapi/com/sun/star/container/XContainerListener.idl
index 556991fe0..48e7c5124 100644
--- a/udkapi/com/sun/star/container/XContainerListener.idl
+++ b/udkapi/com/sun/star/container/XContainerListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XContainerListener_idl__
#define __com_sun_star_container_XContainerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_container_ContainerEvent_idl__
#include <com/sun/star/container/ContainerEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerQuery.idl b/udkapi/com/sun/star/container/XContainerQuery.idl
index 1210310a4..d265fb58b 100644
--- a/udkapi/com/sun/star/container/XContainerQuery.idl
+++ b/udkapi/com/sun/star/container/XContainerQuery.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_container_XContainerQuery_idl__
#define __com_sun_star_container_XContainerQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
index 496b99cf8..86737f2cd 100644
--- a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
#define __com_sun_star_container_XContentEnumerationAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XElementAccess.idl b/udkapi/com/sun/star/container/XElementAccess.idl
index 229513348..212e7e3ab 100644
--- a/udkapi/com/sun/star/container/XElementAccess.idl
+++ b/udkapi/com/sun/star/container/XElementAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XElementAccess_idl__
#define __com_sun_star_container_XElementAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XEnumeration.idl b/udkapi/com/sun/star/container/XEnumeration.idl
index b7bd0dbc6..f699acbf8 100644
--- a/udkapi/com/sun/star/container/XEnumeration.idl
+++ b/udkapi/com/sun/star/container/XEnumeration.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XEnumeration_idl__
#define __com_sun_star_container_XEnumeration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XEnumerationAccess.idl b/udkapi/com/sun/star/container/XEnumerationAccess.idl
index 7e9dc57b2..d67000d2b 100644
--- a/udkapi/com/sun/star/container/XEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XEnumerationAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#define __com_sun_star_container_XEnumerationAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalName.idl b/udkapi/com/sun/star/container/XHierarchicalName.idl
index 8279280a5..4fcb27cbc 100644
--- a/udkapi/com/sun/star/container/XHierarchicalName.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalName.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XHierarchicalName_idl__
#define __com_sun_star_container_XHierarchicalName_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_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
index 4d93ce7ae..ca34580c0 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#define __com_sun_star_container_XHierarchicalNameAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
index 51bbf4fde..685c57094 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
@@ -27,29 +27,15 @@
#ifndef __com_sun_star_container_XHierarchicalNameContainer_idl__
#define __com_sun_star_container_XHierarchicalNameContainer_idl__
-#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
#include <com/sun/star/container/XHierarchicalNameReplace.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
index 55e7547ec..f6f4aad9f 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
#define __com_sun_star_container_XHierarchicalNameReplace_idl__
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIdentifierAccess.idl b/udkapi/com/sun/star/container/XIdentifierAccess.idl
index d426ea227..452e14378 100644
--- a/udkapi/com/sun/star/container/XIdentifierAccess.idl
+++ b/udkapi/com/sun/star/container/XIdentifierAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XIdentifierAccess_idl__
#define __com_sun_star_container_XIdentifierAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIdentifierContainer.idl b/udkapi/com/sun/star/container/XIdentifierContainer.idl
index 70c49342d..fa74bc3ba 100644
--- a/udkapi/com/sun/star/container/XIdentifierContainer.idl
+++ b/udkapi/com/sun/star/container/XIdentifierContainer.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_container_XIdentifierContainer_idl__
#define __com_sun_star_container_XIdentifierContainer_idl__
-#ifndef __com_sun_star_container_XIdentifierReplace_idl__
#include <com/sun/star/container/XIdentifierReplace.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIdentifierReplace.idl b/udkapi/com/sun/star/container/XIdentifierReplace.idl
index 6d305764b..14db22dfe 100644
--- a/udkapi/com/sun/star/container/XIdentifierReplace.idl
+++ b/udkapi/com/sun/star/container/XIdentifierReplace.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_container_XIdentifierReplace_idl__
#define __com_sun_star_container_XIdentifierReplace_idl__
-#ifndef __com_sun_star_container_XIdentifierAccess_idl__
#include <com/sun/star/container/XIdentifierAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XImplicitIDAccess.idl b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
index 1b4f77fee..21bb239a4 100644
--- a/udkapi/com/sun/star/container/XImplicitIDAccess.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XImplicitIDAccess_idl__
#define __com_sun_star_container_XImplicitIDAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XImplicitIDContainer.idl b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
index 768823c9d..856595792 100644
--- a/udkapi/com/sun/star/container/XImplicitIDContainer.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XImplicitIDContainer_idl__
#define __com_sun_star_container_XImplicitIDContainer_idl__
-#ifndef __com_sun_star_container_XImplicitIDReplace_idl__
#include <com/sun/star/container/XImplicitIDReplace.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XImplicitIDReplace.idl b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
index f56a59408..fe1d88872 100644
--- a/udkapi/com/sun/star/container/XImplicitIDReplace.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XImplicitIDReplace_idl__
#define __com_sun_star_container_XImplicitIDReplace_idl__
-#ifndef __com_sun_star_container_XImplicitIDAccess_idl__
#include <com/sun/star/container/XImplicitIDAccess.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIndexAccess.idl b/udkapi/com/sun/star/container/XIndexAccess.idl
index a8e205ef2..e3cf9e8e7 100644
--- a/udkapi/com/sun/star/container/XIndexAccess.idl
+++ b/udkapi/com/sun/star/container/XIndexAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XIndexAccess_idl__
#define __com_sun_star_container_XIndexAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIndexContainer.idl b/udkapi/com/sun/star/container/XIndexContainer.idl
index 61b3a1ce6..acca0fc87 100644
--- a/udkapi/com/sun/star/container/XIndexContainer.idl
+++ b/udkapi/com/sun/star/container/XIndexContainer.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_container_XIndexContainer_idl__
#define __com_sun_star_container_XIndexContainer_idl__
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XIndexReplace.idl b/udkapi/com/sun/star/container/XIndexReplace.idl
index eba1d32e8..5c5e51317 100644
--- a/udkapi/com/sun/star/container/XIndexReplace.idl
+++ b/udkapi/com/sun/star/container/XIndexReplace.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_container_XIndexReplace_idl__
#define __com_sun_star_container_XIndexReplace_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XNameAccess.idl b/udkapi/com/sun/star/container/XNameAccess.idl
index 8e70c34dd..5166deae5 100644
--- a/udkapi/com/sun/star/container/XNameAccess.idl
+++ b/udkapi/com/sun/star/container/XNameAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XNameAccess_idl__
#define __com_sun_star_container_XNameAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XNameContainer.idl b/udkapi/com/sun/star/container/XNameContainer.idl
index 4e222d3a5..3bb94cca2 100644
--- a/udkapi/com/sun/star/container/XNameContainer.idl
+++ b/udkapi/com/sun/star/container/XNameContainer.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_container_XNameContainer_idl__
#define __com_sun_star_container_XNameContainer_idl__
-#ifndef __com_sun_star_container_XNameReplace_idl__
#include <com/sun/star/container/XNameReplace.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XNameReplace.idl b/udkapi/com/sun/star/container/XNameReplace.idl
index 550036a28..d56759b7e 100644
--- a/udkapi/com/sun/star/container/XNameReplace.idl
+++ b/udkapi/com/sun/star/container/XNameReplace.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_container_XNameReplace_idl__
#define __com_sun_star_container_XNameReplace_idl__
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XNamed.idl b/udkapi/com/sun/star/container/XNamed.idl
index a238a739e..f2bc281a5 100644
--- a/udkapi/com/sun/star/container/XNamed.idl
+++ b/udkapi/com/sun/star/container/XNamed.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_XNamed_idl__
#define __com_sun_star_container_XNamed_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XSet.idl b/udkapi/com/sun/star/container/XSet.idl
index 9983f37d0..0f1002edb 100644
--- a/udkapi/com/sun/star/container/XSet.idl
+++ b/udkapi/com/sun/star/container/XSet.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_container_XSet_idl__
#define __com_sun_star_container_XSet_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XStringKeyMap.idl b/udkapi/com/sun/star/container/XStringKeyMap.idl
index 4ea66fd8a..1fcc09800 100644
--- a/udkapi/com/sun/star/container/XStringKeyMap.idl
+++ b/udkapi/com/sun/star/container/XStringKeyMap.idl
@@ -28,25 +28,11 @@
#ifndef __com_sun_star_container_XStringKeyMap_idl__
#define __com_sun_star_container_XStringKeyMap_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 __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/container/XUniqueIDAccess.idl b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
index 03f32a4ba..9a5b587c8 100644
--- a/udkapi/com/sun/star/container/XUniqueIDAccess.idl
+++ b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_container_XUniqueIDAccess_idl__
#define __com_sun_star_container_XUniqueIDAccess_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 5710ec9eb..197917a90 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef __com_sun_star_corba_giop_giop_idl__
+#define __com_sun_star_corba_giop_giop_idl__
+
#include <com/sun/star/corba/iop/iop.idl>
module com { module sun { module star { module corba { module giop
{
@@ -248,4 +251,4 @@ published struct FragmentHeader_1_2
}; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index 6b13f6af1..5736afc37 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef __com_sun_star_corba_iiop_iiop_idl__
+#define __com_sun_star_corba_iiop_iiop_idl__
+
#include <com/sun/star/corba/giop/giop.idl>
module com { module sun { module star { module corba { module iiop
{
@@ -84,4 +87,4 @@ published struct BiDirIIOPServiceContext
};
}; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index 77ef198be..bcfc33a4f 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef __com_sun_star_corba_iop_iop_idl__
+#define __com_sun_star_corba_iop_iop_idl__
+
#include <com/sun/star/corba/corba.idl>
module com { module sun { module star { module corba { module iop
{ // IDL
@@ -120,4 +123,4 @@ module com { module sun { module star { module corba { module iop
};
}; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/io/AlreadyConnectedException.idl b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
index f07e99e8d..f79d7b2fc 100644
--- a/udkapi/com/sun/star/io/AlreadyConnectedException.idl
+++ b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
#define __com_sun_star_io_AlreadyConnectedException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/BufferSizeExceededException.idl b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
index dd6dff849..8f55595a3 100644
--- a/udkapi/com/sun/star/io/BufferSizeExceededException.idl
+++ b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
#define __com_sun_star_io_BufferSizeExceededException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/ConnectException.idl b/udkapi/com/sun/star/io/ConnectException.idl
index 4b4c9fddf..1cde3d444 100644
--- a/udkapi/com/sun/star/io/ConnectException.idl
+++ b/udkapi/com/sun/star/io/ConnectException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_ConnectException_idl__
#define __com_sun_star_io_ConnectException_idl__
-#ifndef __com_sun_star_io_SocketException_idl__
#include <com/sun/star/io/SocketException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/DataInputStream.idl b/udkapi/com/sun/star/io/DataInputStream.idl
index d35a26b60..36eaa3fd8 100644
--- a/udkapi/com/sun/star/io/DataInputStream.idl
+++ b/udkapi/com/sun/star/io/DataInputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_DataInputStream_idl__
#define __com_sun_star_io_DataInputStream_idl__
-#ifndef __com_sun_star_io_XDataInputStream_idl__
#include <com/sun/star/io/XDataInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/DataOutputStream.idl b/udkapi/com/sun/star/io/DataOutputStream.idl
index 03520390b..af5e94f22 100644
--- a/udkapi/com/sun/star/io/DataOutputStream.idl
+++ b/udkapi/com/sun/star/io/DataOutputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_DataOutputStream_idl__
#define __com_sun_star_io_DataOutputStream_idl__
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
#include <com/sun/star/io/XDataOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/DataTransferEvent.idl b/udkapi/com/sun/star/io/DataTransferEvent.idl
index 0edc1050c..e8a9828b1 100644
--- a/udkapi/com/sun/star/io/DataTransferEvent.idl
+++ b/udkapi/com/sun/star/io/DataTransferEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_DataTransferEvent_idl__
#define __com_sun_star_io_DataTransferEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/IOException.idl b/udkapi/com/sun/star/io/IOException.idl
index bcd2a7f2c..bb947bab9 100644
--- a/udkapi/com/sun/star/io/IOException.idl
+++ b/udkapi/com/sun/star/io/IOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_IOException_idl__
#define __com_sun_star_io_IOException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/MarkableInputStream.idl b/udkapi/com/sun/star/io/MarkableInputStream.idl
index b8359260c..2b4183740 100644
--- a/udkapi/com/sun/star/io/MarkableInputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableInputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_DataInputStream_idl__
#define __com_sun_star_io_DataInputStream_idl__
-#ifndef __com_sun_star_io_XMarkableStream_idl__
#include <com/sun/star/io/XMarkableStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
module com { module sun { module star { module io {
diff --git a/udkapi/com/sun/star/io/MarkableOutputStream.idl b/udkapi/com/sun/star/io/MarkableOutputStream.idl
index 592ee57e4..1e00c4c53 100644
--- a/udkapi/com/sun/star/io/MarkableOutputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableOutputStream.idl
@@ -27,17 +27,13 @@
#ifndef __com_sun_star_io_DataInputStream_idl__
#define __com_sun_star_io_DataInputStream_idl__
-#ifndef __com_sun_star_io_XMarkableStream_idl__
#include <com/sun/star/io/XMarkableStream.idl>
-#endif
#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
module com { module sun { module star { module io {
diff --git a/udkapi/com/sun/star/io/NoRouteToHostException.idl b/udkapi/com/sun/star/io/NoRouteToHostException.idl
index 68ca5f2db..d04c6b9f6 100644
--- a/udkapi/com/sun/star/io/NoRouteToHostException.idl
+++ b/udkapi/com/sun/star/io/NoRouteToHostException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_NoRouteToHostException_idl__
#define __com_sun_star_io_NoRouteToHostException_idl__
-#ifndef __com_sun_star_io_SocketException_idl__
#include <com/sun/star/io/SocketException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/NotConnectedException.idl b/udkapi/com/sun/star/io/NotConnectedException.idl
index 0143b7c68..f72f6fdf6 100644
--- a/udkapi/com/sun/star/io/NotConnectedException.idl
+++ b/udkapi/com/sun/star/io/NotConnectedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_NotConnectedException_idl__
#define __com_sun_star_io_NotConnectedException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/ObjectInputStream.idl b/udkapi/com/sun/star/io/ObjectInputStream.idl
index 5784a5436..02b47956c 100644
--- a/udkapi/com/sun/star/io/ObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectInputStream.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_io_ObjectInputStream_idl__
#define __com_sun_star_io_ObjectInputStream_idl__
-#ifndef __com_sun_star_io_XObjectInputStream_idl__
#include <com/sun/star/io/XObjectInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
-#ifndef __com_sun_star_io_XMarkableStream_idl__
#include <com/sun/star/io/XMarkableStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/ObjectOutputStream.idl b/udkapi/com/sun/star/io/ObjectOutputStream.idl
index 7f7cea2f7..edf594d8e 100644
--- a/udkapi/com/sun/star/io/ObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectOutputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_ObjectOutputStream_idl__
#define __com_sun_star_io_ObjectOutputStream_idl__
-#ifndef __com_sun_star_io_XObjectOutputStream_idl__
#include <com/sun/star/io/XObjectOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/Pipe.idl b/udkapi/com/sun/star/io/Pipe.idl
index fa67dd989..3774765c1 100644
--- a/udkapi/com/sun/star/io/Pipe.idl
+++ b/udkapi/com/sun/star/io/Pipe.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_Pipe_idl__
#define __com_sun_star_io_Pipe_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl
index 9b935cf34..e716bba56 100644
--- a/udkapi/com/sun/star/io/Pump.idl
+++ b/udkapi/com/sun/star/io/Pump.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_Pipe_idl__
#define __com_sun_star_io_Pipe_idl__
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataControl_idl__
#include <com/sun/star/io/XActiveDataControl.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/SequenceInputStream.idl b/udkapi/com/sun/star/io/SequenceInputStream.idl
index 915e94fd3..c49b9e5a4 100644
--- a/udkapi/com/sun/star/io/SequenceInputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceInputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_SequenceInputStream_idl__
#define __com_sun_star_io_SequenceInputStream_idl__
-#ifndef __com_sun_star_io_XSeekableInputStream_idl__
#include <com/sun/star/io/XSeekableInputStream.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/SequenceOutputStream.idl b/udkapi/com/sun/star/io/SequenceOutputStream.idl
index 8e3959b4f..36fd73625 100644
--- a/udkapi/com/sun/star/io/SequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceOutputStream.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_SequenceOutputStream_idl__
#define __com_sun_star_io_SequenceOutputStream_idl__
-#ifndef __com_sun_star_io_XSequenceOutputStream_idl__
#include <com/sun/star/io/XSequenceOutputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/SocketException.idl b/udkapi/com/sun/star/io/SocketException.idl
index 7bc42bd74..ef8491f8d 100644
--- a/udkapi/com/sun/star/io/SocketException.idl
+++ b/udkapi/com/sun/star/io/SocketException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_SocketException_idl__
#define __com_sun_star_io_SocketException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index 5c8306708..8a84eed45 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_TempFile_idl__
#define __com_sun_star_io_TempFile_idl__
-#ifndef __com_sun_star_io_XTempFile_idl__
#include <com/sun/star/io/XTempFile.idl>
-#endif
//=========================================================================
diff --git a/udkapi/com/sun/star/io/TextInputStream.idl b/udkapi/com/sun/star/io/TextInputStream.idl
index 1fe30d1da..e153bd62c 100644
--- a/udkapi/com/sun/star/io/TextInputStream.idl
+++ b/udkapi/com/sun/star/io/TextInputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_TextInputStream_idl__
#define __com_sun_star_io_TextInputStream_idl__
-#ifndef __com_sun_star_io_XTextInputStream_idl__
#include <com/sun/star/io/XTextInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-#ifndef __com_sun_star_io_XConnectable_idl__
#include <com/sun/star/io/XConnectable.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/TextOutputStream.idl b/udkapi/com/sun/star/io/TextOutputStream.idl
index 93437070c..70f7b19c0 100644
--- a/udkapi/com/sun/star/io/TextOutputStream.idl
+++ b/udkapi/com/sun/star/io/TextOutputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_TextOutputStream_idl__
#define __com_sun_star_io_TextOutputStream_idl__
-#ifndef __com_sun_star_io_XTextOutputStream_idl__
#include <com/sun/star/io/XTextOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/UnexpectedEOFException.idl b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
index f26763934..8fc41a24c 100644
--- a/udkapi/com/sun/star/io/UnexpectedEOFException.idl
+++ b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_UnexpectedEOFException_idl__
#define __com_sun_star_io_UnexpectedEOFException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/UnknownHostException.idl b/udkapi/com/sun/star/io/UnknownHostException.idl
index 3b25f3f5a..8f53567c6 100644
--- a/udkapi/com/sun/star/io/UnknownHostException.idl
+++ b/udkapi/com/sun/star/io/UnknownHostException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_UnknownHostException_idl__
#define __com_sun_star_io_UnknownHostException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/WrongFormatException.idl b/udkapi/com/sun/star/io/WrongFormatException.idl
index 00ee9dd3d..594dd2f44 100644
--- a/udkapi/com/sun/star/io/WrongFormatException.idl
+++ b/udkapi/com/sun/star/io/WrongFormatException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_WrongFormatException_idl__
#define __com_sun_star_io_WrongFormatException_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataControl.idl b/udkapi/com/sun/star/io/XActiveDataControl.idl
index f8726c2b9..4e5c55bfa 100644
--- a/udkapi/com/sun/star/io/XActiveDataControl.idl
+++ b/udkapi/com/sun/star/io/XActiveDataControl.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XActiveDataControl_idl__
#define __com_sun_star_io_XActiveDataControl_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XStreamListener_idl__
#include <com/sun/star/io/XStreamListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataSink.idl b/udkapi/com/sun/star/io/XActiveDataSink.idl
index 06c8b43d6..f08e120fd 100644
--- a/udkapi/com/sun/star/io/XActiveDataSink.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSink.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XActiveDataSink_idl__
#define __com_sun_star_io_XActiveDataSink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataSource.idl b/udkapi/com/sun/star/io/XActiveDataSource.idl
index 7d00e2ec2..98cc22eb2 100644
--- a/udkapi/com/sun/star/io/XActiveDataSource.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSource.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XActiveDataSource_idl__
#define __com_sun_star_io_XActiveDataSource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataStreamer.idl b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
index 55b7ff103..b20a10434 100644
--- a/udkapi/com/sun/star/io/XActiveDataStreamer.idl
+++ b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XActiveDataStreamer_idl__
#define __com_sun_star_io_XActiveDataStreamer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
index ff21541dd..c36f3e58e 100644
--- a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
+++ b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_io_XAsyncOutputMonitor_idl__
#define __com_sun_star_io_XAsyncOutputMonitor_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include "com/sun/star/io/IOException.idl"
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include "com/sun/star/uno/XInterface.idl"
-#endif
module com { module sun { module star { module io {
diff --git a/udkapi/com/sun/star/io/XConnectable.idl b/udkapi/com/sun/star/io/XConnectable.idl
index 0570d1d19..f6a61636f 100644
--- a/udkapi/com/sun/star/io/XConnectable.idl
+++ b/udkapi/com/sun/star/io/XConnectable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_XConnectable_idl__
#define __com_sun_star_io_XConnectable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataExporter.idl b/udkapi/com/sun/star/io/XDataExporter.idl
index 83967f5cc..3eb2b8727 100644
--- a/udkapi/com/sun/star/io/XDataExporter.idl
+++ b/udkapi/com/sun/star/io/XDataExporter.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_io_XDataExporter_idl__
#define __com_sun_star_io_XDataExporter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
#include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataImporter.idl b/udkapi/com/sun/star/io/XDataImporter.idl
index e22d2a7c2..4eaca697c 100644
--- a/udkapi/com/sun/star/io/XDataImporter.idl
+++ b/udkapi/com/sun/star/io/XDataImporter.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_io_XDataImporter_idl__
#define __com_sun_star_io_XDataImporter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
#include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataInputStream.idl b/udkapi/com/sun/star/io/XDataInputStream.idl
index a33e1180a..ef8fc271a 100644
--- a/udkapi/com/sun/star/io/XDataInputStream.idl
+++ b/udkapi/com/sun/star/io/XDataInputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XDataInputStream_idl__
#define __com_sun_star_io_XDataInputStream_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataOutputStream.idl b/udkapi/com/sun/star/io/XDataOutputStream.idl
index 0cba07c0b..1ec3471ce 100644
--- a/udkapi/com/sun/star/io/XDataOutputStream.idl
+++ b/udkapi/com/sun/star/io/XDataOutputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XDataOutputStream_idl__
#define __com_sun_star_io_XDataOutputStream_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataTransferEventListener.idl b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
index 7d805211c..593a33542 100644
--- a/udkapi/com/sun/star/io/XDataTransferEventListener.idl
+++ b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
#define __com_sun_star_io_XDataTransferEventListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_io_DataTransferEvent_idl__
#include <com/sun/star/io/DataTransferEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XInputStream.idl b/udkapi/com/sun/star/io/XInputStream.idl
index 370c47497..38fccedaf 100644
--- a/udkapi/com/sun/star/io/XInputStream.idl
+++ b/udkapi/com/sun/star/io/XInputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_XInputStream_idl__
#define __com_sun_star_io_XInputStream_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
#include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XInputStreamProvider.idl b/udkapi/com/sun/star/io/XInputStreamProvider.idl
index 16495296d..96d96334f 100644
--- a/udkapi/com/sun/star/io/XInputStreamProvider.idl
+++ b/udkapi/com/sun/star/io/XInputStreamProvider.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_XInputStreamProvider_idl__
#define __com_sun_star_io_XInputStreamProvider_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XMarkableStream.idl b/udkapi/com/sun/star/io/XMarkableStream.idl
index 331b3dcca..eb48dd7d5 100644
--- a/udkapi/com/sun/star/io/XMarkableStream.idl
+++ b/udkapi/com/sun/star/io/XMarkableStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_XMarkableStream_idl__
#define __com_sun_star_io_XMarkableStream_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_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XObjectInputStream.idl b/udkapi/com/sun/star/io/XObjectInputStream.idl
index e42421962..e71d30108 100644
--- a/udkapi/com/sun/star/io/XObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectInputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_XObjectInputStream_idl__
#define __com_sun_star_io_XObjectInputStream_idl__
-#ifndef __com_sun_star_io_XDataInputStream_idl__
#include <com/sun/star/io/XDataInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XObjectOutputStream.idl b/udkapi/com/sun/star/io/XObjectOutputStream.idl
index c043ff0ea..ae5a52079 100644
--- a/udkapi/com/sun/star/io/XObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectOutputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XObjectOutputStream_idl__
#define __com_sun_star_io_XObjectOutputStream_idl__
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
#include <com/sun/star/io/XDataOutputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XOutputStream.idl b/udkapi/com/sun/star/io/XOutputStream.idl
index 6560c9247..dfe11b21f 100644
--- a/udkapi/com/sun/star/io/XOutputStream.idl
+++ b/udkapi/com/sun/star/io/XOutputStream.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_io_XOutputStream_idl__
#define __com_sun_star_io_XOutputStream_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
#include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XPersist.idl b/udkapi/com/sun/star/io/XPersist.idl
index 67fb03bff..bdc6f343e 100644
--- a/udkapi/com/sun/star/io/XPersist.idl
+++ b/udkapi/com/sun/star/io/XPersist.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XPersist_idl__
#define __com_sun_star_io_XPersist_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
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XPersistObject.idl b/udkapi/com/sun/star/io/XPersistObject.idl
index d96267af7..103f6ee3c 100644
--- a/udkapi/com/sun/star/io/XPersistObject.idl
+++ b/udkapi/com/sun/star/io/XPersistObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XPersistObject_idl__
#define __com_sun_star_io_XPersistObject_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
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XSeekable.idl b/udkapi/com/sun/star/io/XSeekable.idl
index 50bef42f5..b77dc4afa 100644
--- a/udkapi/com/sun/star/io/XSeekable.idl
+++ b/udkapi/com/sun/star/io/XSeekable.idl
@@ -27,16 +27,10 @@
#ifndef __com_sun_star_io_XSeekable_idl__
#define __com_sun_star_io_XSeekable_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_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XSeekableInputStream.idl b/udkapi/com/sun/star/io/XSeekableInputStream.idl
index abc6f3190..0d31c053f 100644
--- a/udkapi/com/sun/star/io/XSeekableInputStream.idl
+++ b/udkapi/com/sun/star/io/XSeekableInputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XSeekableInputStream_idl__
#define __com_sun_star_io_XSeekableInputStream_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XSeekable_idl__
#include <com/sun/star/io/XSeekable.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XSequenceOutputStream.idl b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
index cc73365cd..0b86f8506 100644
--- a/udkapi/com/sun/star/io/XSequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_io_XSequenceOutputStream_idl__
#define __com_sun_star_io_XSequenceOutputStream_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XStream.idl b/udkapi/com/sun/star/io/XStream.idl
index daf6d8f18..81b10da3e 100644
--- a/udkapi/com/sun/star/io/XStream.idl
+++ b/udkapi/com/sun/star/io/XStream.idl
@@ -27,16 +27,9 @@
#ifndef __com_sun_star_io_XStream_idl__
#define __com_sun_star_io_XStream_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XStreamListener.idl b/udkapi/com/sun/star/io/XStreamListener.idl
index 9608c560c..0f2a97eab 100644
--- a/udkapi/com/sun/star/io/XStreamListener.idl
+++ b/udkapi/com/sun/star/io/XStreamListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_io_XStreamListener_idl__
#define __com_sun_star_io_XStreamListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index 1263e8ccf..ab0d51a47 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_io_XTempFile_idl__
#define __com_sun_star_io_XTempFile_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
#include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
#include <com/sun/star/io/XSeekable.idl>
-#endif
//========================================================================
diff --git a/udkapi/com/sun/star/io/XTextInputStream.idl b/udkapi/com/sun/star/io/XTextInputStream.idl
index e2a9275a3..211cc981c 100644
--- a/udkapi/com/sun/star/io/XTextInputStream.idl
+++ b/udkapi/com/sun/star/io/XTextInputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XTextInputStream_idl__
#define __com_sun_star_io_XTextInputStream_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XTextOutputStream.idl b/udkapi/com/sun/star/io/XTextOutputStream.idl
index ecf30ab39..3ec30be2f 100644
--- a/udkapi/com/sun/star/io/XTextOutputStream.idl
+++ b/udkapi/com/sun/star/io/XTextOutputStream.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_io_XTextOutputStream_idl__
#define __com_sun_star_io_XTextOutputStream_idl__
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XTruncate.idl b/udkapi/com/sun/star/io/XTruncate.idl
index 573c90074..1e25bcb62 100644
--- a/udkapi/com/sun/star/io/XTruncate.idl
+++ b/udkapi/com/sun/star/io/XTruncate.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_io_XTruncate_idl__
#define __com_sun_star_io_XTruncate_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
//=============================================================================
diff --git a/udkapi/com/sun/star/io/XXMLExtractor.idl b/udkapi/com/sun/star/io/XXMLExtractor.idl
index 9c8e9a95d..3dfa926fa 100644
--- a/udkapi/com/sun/star/io/XXMLExtractor.idl
+++ b/udkapi/com/sun/star/io/XXMLExtractor.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_io_XXMLExtractor_idl__
#define __com_sun_star_io_XXMLExtractor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
index ef4609bb2..85c9151da 100755..100644
--- a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
+++ b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_InvalidJavaSettingsException_idl__
#define __com_sun_star_java_InvalidJavaSettingsException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/JavaDisabledException.idl b/udkapi/com/sun/star/java/JavaDisabledException.idl
index ef3601a7e..945106278 100644
--- a/udkapi/com/sun/star/java/JavaDisabledException.idl
+++ b/udkapi/com/sun/star/java/JavaDisabledException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_JavaDisabledException_idl__
#define __com_sun_star_java_JavaDisabledException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/JavaInitializationException.idl b/udkapi/com/sun/star/java/JavaInitializationException.idl
index 93ac0d0e0..f71ae22ec 100644
--- a/udkapi/com/sun/star/java/JavaInitializationException.idl
+++ b/udkapi/com/sun/star/java/JavaInitializationException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_JavaInitializationException_idl__
#define __com_sun_star_java_JavaInitializationException_idl__
-#ifndef __com_sun_star_uno_DeploymentException_idl__
#include <com/sun/star/uno/DeploymentException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
index 2643a9274..48273a0f8 100644
--- a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
+++ b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_JavaNotConfiguredException_idl__
#define __com_sun_star_java_JavaNotConfiguredException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/JavaNotFoundException.idl b/udkapi/com/sun/star/java/JavaNotFoundException.idl
index 520afcfde..f8756ebdb 100644
--- a/udkapi/com/sun/star/java/JavaNotFoundException.idl
+++ b/udkapi/com/sun/star/java/JavaNotFoundException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_JavaNotFoundException_idl__
#define __com_sun_star_java_JavaNotFoundException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
index e6d27d2cb..255379cb2 100644
--- a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
+++ b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_JavaVMCreationFailureException_idl__
#define __com_sun_star_java_JavaVMCreationFailureException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
index b17897f5f..2a6fc052d 100644
--- a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
+++ b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_MissingJavaRuntimeException_idl__
#define __com_sun_star_java_MissingJavaRuntimeException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/RestartRequiredException.idl b/udkapi/com/sun/star/java/RestartRequiredException.idl
index 11a19977c..942124467 100755..100644
--- a/udkapi/com/sun/star/java/RestartRequiredException.idl
+++ b/udkapi/com/sun/star/java/RestartRequiredException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_RestartRequiredException_idl__
#define __com_sun_star_java_RestartRequiredException_idl__
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
#include <com/sun/star/java/JavaInitializationException.idl>
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/WrongJavaVersionException.idl b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
index 18780a6c5..b410f21e5 100644
--- a/udkapi/com/sun/star/java/WrongJavaVersionException.idl
+++ b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_java_WrongJavaVersionException_idl__
#define __com_sun_star_java_WrongJavaVersionException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include "com/sun/star/uno/Exception.idl"
-#endif
module com { module sun { module star { module java {
diff --git a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
index 710b067f3..5a45e17f8 100644
--- a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
+++ b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_java_XJavaThreadRegister_11_idl__
#define __com_sun_star_java_XJavaThreadRegister_11_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/java/XJavaVM.idl b/udkapi/com/sun/star/java/XJavaVM.idl
index 5cca4dc32..678f67e2b 100644
--- a/udkapi/com/sun/star/java/XJavaVM.idl
+++ b/udkapi/com/sun/star/java/XJavaVM.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_java_XJavaVM_idl__
#define __com_sun_star_java_XJavaVM_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
index c6e54eb17..053e0c591 100644
--- a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
#define __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/ClassNotFoundException.idl b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
index 42d55ffd7..c4ec47153 100644
--- a/udkapi/com/sun/star/lang/ClassNotFoundException.idl
+++ b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_ClassNotFoundException_idl__
#define __com_sun_star_lang_ClassNotFoundException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/DisposedException.idl b/udkapi/com/sun/star/lang/DisposedException.idl
index 2d6a90e4d..4aa925165 100644
--- a/udkapi/com/sun/star/lang/DisposedException.idl
+++ b/udkapi/com/sun/star/lang/DisposedException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_DisposedException_idl__
#define __com_sun_star_lang_DisposedException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/EventObject.idl b/udkapi/com/sun/star/lang/EventObject.idl
index 73f5e08ac..49d1b959e 100644
--- a/udkapi/com/sun/star/lang/EventObject.idl
+++ b/udkapi/com/sun/star/lang/EventObject.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_EventObject_idl__
#define __com_sun_star_lang_EventObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/IllegalAccessException.idl b/udkapi/com/sun/star/lang/IllegalAccessException.idl
index 0049c4cb2..8ed405bca 100644
--- a/udkapi/com/sun/star/lang/IllegalAccessException.idl
+++ b/udkapi/com/sun/star/lang/IllegalAccessException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#define __com_sun_star_lang_IllegalAccessException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/IllegalArgumentException.idl b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
index cd44a816a..db825b8b5 100644
--- a/udkapi/com/sun/star/lang/IllegalArgumentException.idl
+++ b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#define __com_sun_star_lang_IllegalArgumentException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
index cf0beec40..624315a20 100644
--- a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#define __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/InvalidListenerException.idl b/udkapi/com/sun/star/lang/InvalidListenerException.idl
index 5c5d18448..3cdc8fa6d 100644
--- a/udkapi/com/sun/star/lang/InvalidListenerException.idl
+++ b/udkapi/com/sun/star/lang/InvalidListenerException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_InvalidListenerException_idl__
#define __com_sun_star_lang_InvalidListenerException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/ListenerExistException.idl b/udkapi/com/sun/star/lang/ListenerExistException.idl
index bc37d0583..d55e15cf1 100644
--- a/udkapi/com/sun/star/lang/ListenerExistException.idl
+++ b/udkapi/com/sun/star/lang/ListenerExistException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_ListenerExistException_idl__
#define __com_sun_star_lang_ListenerExistException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
index 02913c6eb..e5c5e60e5 100644
--- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
@@ -27,16 +27,10 @@
#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
#define __com_sun_star_lang_MultiServiceFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSuchFieldException.idl b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
index 97fe891d6..9b6ce36bb 100644
--- a/udkapi/com/sun/star/lang/NoSuchFieldException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_NoSuchFieldException_idl__
#define __com_sun_star_lang_NoSuchFieldException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSuchMethodException.idl b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
index d77916cce..407bffcb5 100644
--- a/udkapi/com/sun/star/lang/NoSuchMethodException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_NoSuchMethodException_idl__
#define __com_sun_star_lang_NoSuchMethodException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSupportException.idl b/udkapi/com/sun/star/lang/NoSupportException.idl
index 7056be732..e91e9644e 100644
--- a/udkapi/com/sun/star/lang/NoSupportException.idl
+++ b/udkapi/com/sun/star/lang/NoSupportException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_NoSupportException_idl__
#define __com_sun_star_lang_NoSupportException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/NotInitializedException.idl b/udkapi/com/sun/star/lang/NotInitializedException.idl
index 3993031a2..f6ac6b0a1 100644
--- a/udkapi/com/sun/star/lang/NotInitializedException.idl
+++ b/udkapi/com/sun/star/lang/NotInitializedException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_lang_NotInitializedException_idl__
#define __com_sun_star_lang_NotInitializedException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/NullPointerException.idl b/udkapi/com/sun/star/lang/NullPointerException.idl
index 41d56941b..e0697e209 100644
--- a/udkapi/com/sun/star/lang/NullPointerException.idl
+++ b/udkapi/com/sun/star/lang/NullPointerException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_NullPointerException_idl__
#define __com_sun_star_lang_NullPointerException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/RegistryServiceManager.idl b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
index 7fe99e897..bd4704679 100644
--- a/udkapi/com/sun/star/lang/RegistryServiceManager.idl
+++ b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_lang_RegistryServiceManager_idl__
#define __com_sun_star_lang_RegistryServiceManager_idl__
-#ifndef __com_sun_star_lang_ServiceManager_idl__
#include <com/sun/star/lang/ServiceManager.idl>
-#endif
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
#include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/ServiceManager.idl b/udkapi/com/sun/star/lang/ServiceManager.idl
index 7ad6a7326..bab721151 100644
--- a/udkapi/com/sun/star/lang/ServiceManager.idl
+++ b/udkapi/com/sun/star/lang/ServiceManager.idl
@@ -27,37 +27,20 @@
#ifndef __com_sun_star_lang_ServiceManager_idl__
#define __com_sun_star_lang_ServiceManager_idl__
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
#include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XSet_idl__
#include <com/sun/star/container/XSet.idl>
-#endif
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
#include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
index 563c6c1fd..c42281574 100644
--- a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
+++ b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
#define __com_sun_star_lang_ServiceNotRegisteredException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/WrappedTargetException.idl b/udkapi/com/sun/star/lang/WrappedTargetException.idl
index 4dd932258..25a0c9740 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#define __com_sun_star_lang_WrappedTargetException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
index 44717f4f3..2bf39d5dc 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_WrappedTargetRuntimeException_idl__
#define __com_sun_star_lang_WrappedTargetRuntimeException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XComponent.idl b/udkapi/com/sun/star/lang/XComponent.idl
index cbf70b706..8ec540bf9 100644
--- a/udkapi/com/sun/star/lang/XComponent.idl
+++ b/udkapi/com/sun/star/lang/XComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XComponent_idl__
#define __com_sun_star_lang_XComponent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XConnectionPoint.idl b/udkapi/com/sun/star/lang/XConnectionPoint.idl
index 95cbe3bf3..edafc6001 100644
--- a/udkapi/com/sun/star/lang/XConnectionPoint.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPoint.idl
@@ -27,21 +27,12 @@
#ifndef __com_sun_star_lang_XConnectionPoint_idl__
#define __com_sun_star_lang_XConnectionPoint_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
#include <com/sun/star/lang/XConnectionPointContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_ListenerExistException_idl__
#include <com/sun/star/lang/ListenerExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_InvalidListenerException_idl__
#include <com/sun/star/lang/InvalidListenerException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
index 33a6c1fa0..c2bd272e8 100644
--- a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
#define __com_sun_star_lang_XConnectionPointContainer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XEventListener.idl b/udkapi/com/sun/star/lang/XEventListener.idl
index af4e505c1..4230f0875 100644
--- a/udkapi/com/sun/star/lang/XEventListener.idl
+++ b/udkapi/com/sun/star/lang/XEventListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XEventListener_idl__
#define __com_sun_star_lang_XEventListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XInitialization.idl b/udkapi/com/sun/star/lang/XInitialization.idl
index 0f5c8946b..91c274f8f 100644
--- a/udkapi/com/sun/star/lang/XInitialization.idl
+++ b/udkapi/com/sun/star/lang/XInitialization.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XInitialization_idl__
#define __com_sun_star_lang_XInitialization_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XLocalizable.idl b/udkapi/com/sun/star/lang/XLocalizable.idl
index 30dc0fcb4..bbf2fcb32 100644
--- a/udkapi/com/sun/star/lang/XLocalizable.idl
+++ b/udkapi/com/sun/star/lang/XLocalizable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XLocalizable_idl__
#define __com_sun_star_lang_XLocalizable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XMain.idl b/udkapi/com/sun/star/lang/XMain.idl
index 70b000349..071a658b3 100644
--- a/udkapi/com/sun/star/lang/XMain.idl
+++ b/udkapi/com/sun/star/lang/XMain.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XMain_idl__
#define __com_sun_star_lang_XMain_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
index 5b72549ac..696b67f9c 100644
--- a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
#define __com_sun_star_lang_XMultiComponentFactory_idl__
-#ifndef __com_sun_star_uno_XComponentContext_idl__
#include <com/sun/star/uno/XComponentContext.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
index 7278defb1..2a03c2642 100644
--- a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#define __com_sun_star_lang_XMultiServiceFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XServiceDisplayName.idl b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
index 2331393a7..eaacba745 100644
--- a/udkapi/com/sun/star/lang/XServiceDisplayName.idl
+++ b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
#define __com_sun_star_lang_XServiceDisplayName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XServiceInfo.idl b/udkapi/com/sun/star/lang/XServiceInfo.idl
index bd0acdb07..4c8eaf172 100644
--- a/udkapi/com/sun/star/lang/XServiceInfo.idl
+++ b/udkapi/com/sun/star/lang/XServiceInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XServiceInfo_idl__
#define __com_sun_star_lang_XServiceInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XServiceName.idl b/udkapi/com/sun/star/lang/XServiceName.idl
index 5c55c363e..1100e2b64 100644
--- a/udkapi/com/sun/star/lang/XServiceName.idl
+++ b/udkapi/com/sun/star/lang/XServiceName.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XServiceName_idl__
#define __com_sun_star_lang_XServiceName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
index 580ec8f59..911d7baf4 100644
--- a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
#define __com_sun_star_lang_XSingleComponentFactory_idl__
-#ifndef __com_sun_star_uno_XComponentContext_idl__
#include <com/sun/star/uno/XComponentContext.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
index 74bdd4ee4..cec228ebe 100644
--- a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#define __com_sun_star_lang_XSingleServiceFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XTypeProvider.idl b/udkapi/com/sun/star/lang/XTypeProvider.idl
index 4ec3d75cc..21094262e 100644
--- a/udkapi/com/sun/star/lang/XTypeProvider.idl
+++ b/udkapi/com/sun/star/lang/XTypeProvider.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_lang_XTypeProvider_idl__
#define __com_sun_star_lang_XTypeProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/lang/XUnoTunnel.idl b/udkapi/com/sun/star/lang/XUnoTunnel.idl
index 3b4ecfd61..a3a0b28c5 100644
--- a/udkapi/com/sun/star/lang/XUnoTunnel.idl
+++ b/udkapi/com/sun/star/lang/XUnoTunnel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_lang_XUnoTunnel_idl__
#define __com_sun_star_lang_XUnoTunnel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
diff --git a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
index 1169c29e1..81ba8438e 100644
--- a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
+++ b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
#define __com_sun_star_loader_CannotActivateFactoryException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/loader/Java2.idl b/udkapi/com/sun/star/loader/Java2.idl
index 9238d70cb..e5c967f1f 100644
--- a/udkapi/com/sun/star/loader/Java2.idl
+++ b/udkapi/com/sun/star/loader/Java2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_loader_Java2_idl__
#define __com_sun_star_loader_Java2_idl__
-#ifndef __com_sun_star_loader_Java_idl__
#include <com/sun/star/loader/Java.idl>
-#endif
module com { module sun { module star { module loader {
diff --git a/udkapi/com/sun/star/loader/XImplementationLoader.idl b/udkapi/com/sun/star/loader/XImplementationLoader.idl
index 2670c682c..b1117cfc2 100644
--- a/udkapi/com/sun/star/loader/XImplementationLoader.idl
+++ b/udkapi/com/sun/star/loader/XImplementationLoader.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_loader_XImplementationLoader_idl__
#define __com_sun_star_loader_XImplementationLoader_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_registry_XRegistryKey_idl__
#include <com/sun/star/registry/XRegistryKey.idl>
-#endif
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
#include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
-#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
#include <com/sun/star/loader/CannotActivateFactoryException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/CoreReflection.idl b/udkapi/com/sun/star/reflection/CoreReflection.idl
index ec07542fc..81281db88 100644
--- a/udkapi/com/sun/star/reflection/CoreReflection.idl
+++ b/udkapi/com/sun/star/reflection/CoreReflection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_reflection_CoreReflection_idl__
#define __com_sun_star_reflection_CoreReflection_idl__
-#ifndef __com_sun_star_reflection_XIdlReflection_idl__
#include <com/sun/star/reflection/XIdlReflection.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index 80bf701c8..b701277d8 100644
--- a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_reflection_InvaildTypeNameException_idl__
#define __com_sun_star_reflection_InvalidTypeNameException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/InvocationTargetException.idl b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
index 6713d80f9..33742321a 100644
--- a/udkapi/com/sun/star/reflection/InvocationTargetException.idl
+++ b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#define __com_sun_star_reflection_InvocationTargetException_idl__
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
index 60db1efcd..c2091cef2 100644
--- a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_reflection_NoSuchTypeNameException_idl__
#define __com_sun_star_reflection_NoSuchTypeNameException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/ParamInfo.idl b/udkapi/com/sun/star/reflection/ParamInfo.idl
index bac6fd1db..38e196dd4 100644
--- a/udkapi/com/sun/star/reflection/ParamInfo.idl
+++ b/udkapi/com/sun/star/reflection/ParamInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_ParamInfo_idl__
#define __com_sun_star_reflection_ParamInfo_idl__
-#ifndef __com_sun_star_reflection_ParamMode_idl__
#include <com/sun/star/reflection/ParamMode.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/ProxyFactory.idl b/udkapi/com/sun/star/reflection/ProxyFactory.idl
index 99ab2912a..aaee2db3c 100644
--- a/udkapi/com/sun/star/reflection/ProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/ProxyFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_ProxyFactory_idl__
#define __com_sun_star_reflection_ProxyFactory_idl__
-#ifndef __com_sun_star_reflection_XProxyFactory_idl__
#include <com/sun/star/reflection/XProxyFactory.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
index 7741da961..c41305f5c 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_reflection_TypeDescriptionManager_idl__
#define __com_sun_star_reflection_TypeDescriptionManager_idl__
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XSet_idl__
#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
index 25f1c77ff..a72ba14b7 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_reflection_TypeDescriptionProvider_idl__
#define __com_sun_star_reflection_TypeDescriptionProvider_idl__
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
index 0529e627e..fa4c7418d 100644
--- a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XArrayTypeDescription_idl__
#define __com_sun_star_reflection_XArrayTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
index 8554d7dbb..a7306a8f8 100644
--- a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XCompoundTypeDescription_idl__
#define __com_sun_star_reflection_XCompoundTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
index c960c9f6e..fc28257c8 100644
--- a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_reflection_XConstantTypeDescription_idl__
#define __com_sun_star_reflection_XConstantTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
index 181d2528b..bb306edf6 100644
--- a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_reflection_XConstantsTypeDescription_idl__
#define __com_sun_star_reflection_XConstantsTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XConstantTypeDescription_idl__
#include <com/sun/star/reflection/XConstantTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
index 67219dcb3..bd2f17d2c 100644
--- a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XEnumTypeDescription_idl__
#define __com_sun_star_reflection_XEnumTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlArray.idl b/udkapi/com/sun/star/reflection/XIdlArray.idl
index 8bd063062..a7a59d0cd 100644
--- a/udkapi/com/sun/star/reflection/XIdlArray.idl
+++ b/udkapi/com/sun/star/reflection/XIdlArray.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_reflection_XIdlArray_idl__
#define __com_sun_star_reflection_XIdlArray_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_lang_ArrayIndexOutOfBoundsException_idl__
#include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlClass.idl b/udkapi/com/sun/star/reflection/XIdlClass.idl
index 7c29f0bb0..48764bc8c 100644
--- a/udkapi/com/sun/star/reflection/XIdlClass.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClass.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_reflection_XIdlClass_idl__
#define __com_sun_star_reflection_XIdlClass_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
-#ifndef __com_sun_star_uno_Uik_idl__
#include <com/sun/star/uno/Uik.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
index 0eb83d7a9..8906ab25a 100644
--- a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_reflection_XIdlClassProvider_idl__
#define __com_sun_star_reflection_XIdlClassProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlField.idl b/udkapi/com/sun/star/reflection/XIdlField.idl
index d03e8b548..aea45b510 100644
--- a/udkapi/com/sun/star/reflection/XIdlField.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_reflection_XIdlField_idl__
#define __com_sun_star_reflection_XIdlField_idl__
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
#include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlField2.idl b/udkapi/com/sun/star/reflection/XIdlField2.idl
index c13441947..e882a7a5c 100644
--- a/udkapi/com/sun/star/reflection/XIdlField2.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField2.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_reflection_XIdlField2_idl__
#define __com_sun_star_reflection_XIdlField2_idl__
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
#include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlMember.idl b/udkapi/com/sun/star/reflection/XIdlMember.idl
index 72d518f2c..ee7e8c5da 100644
--- a/udkapi/com/sun/star/reflection/XIdlMember.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMember.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XIdlMember_idl__
#define __com_sun_star_reflection_XIdlMember_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlMethod.idl b/udkapi/com/sun/star/reflection/XIdlMethod.idl
index 07ac4677f..ecfdb9fbe 100644
--- a/udkapi/com/sun/star/reflection/XIdlMethod.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMethod.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_reflection_XIdlMethod_idl__
#define __com_sun_star_reflection_XIdlMethod_idl__
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-#ifndef __com_sun_star_reflection_ParamInfo_idl__
#include <com/sun/star/reflection/ParamInfo.idl>
-#endif
-#ifndef __com_sun_star_reflection_MethodMode_idl__
#include <com/sun/star/reflection/MethodMode.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlReflection.idl b/udkapi/com/sun/star/reflection/XIdlReflection.idl
index 3eb826760..2a121400c 100644
--- a/udkapi/com/sun/star/reflection/XIdlReflection.idl
+++ b/udkapi/com/sun/star/reflection/XIdlReflection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_reflection_XIdlReflection_idl__
#define __com_sun_star_reflection_XIdlReflection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
index 20bb33177..36633b531 100644
--- a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XIndirectTypeDescription_idl__
#define __com_sun_star_reflection_XIndirectTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
index 2e48f2125..23bff75df 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
#define __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
index 8654ac480..fab1fadd8 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
#define __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
index f2a6b118f..b84c4301e 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
#define __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_reflection_XMethodParameter_idl__
#include <com/sun/star/reflection/XMethodParameter.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
index 1aad8f5be..918d0c2fc 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__
#define __com_sun_star_reflection_XInterfaceTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_uno_Uik_idl__
#include <com/sun/star/uno/Uik.idl>
-#endif
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XMethodParameter.idl b/udkapi/com/sun/star/reflection/XMethodParameter.idl
index 4a9d167ac..6df613c5c 100644
--- a/udkapi/com/sun/star/reflection/XMethodParameter.idl
+++ b/udkapi/com/sun/star/reflection/XMethodParameter.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_reflection_XMethodParameter_idl__
#define __com_sun_star_reflection_XMethodParameter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
index d274e37c8..1b12d8c1e 100644
--- a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_reflection_XModuleTypeDescription_idl__
#define __com_sun_star_reflection_XModuleTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
index 0f6ad9887..e5a34ef88 100644
--- a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_reflection_XPropertyTypeDescription_idl__
#define __com_sun_star_reflection_XPropertyTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XProxyFactory.idl b/udkapi/com/sun/star/reflection/XProxyFactory.idl
index fea53034f..7f496c15b 100644
--- a/udkapi/com/sun/star/reflection/XProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/XProxyFactory.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_reflection_XProxyFactory_idl__
#define __com_sun_star_reflection_XProxyFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_XAggregation_idl__
#include <com/sun/star/uno/XAggregation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
index 0aabca39c..c9e78c2cc 100644
--- a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_reflection_XServiceTypeDescription_idl__
#define __com_sun_star_reflection_XServiceTypeDescription_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__
#include <com/sun/star/reflection/XInterfaceTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_reflection_XPropertyTypeDescription_idl__
#include <com/sun/star/reflection/XPropertyTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
index 047cb52f9..173cef7ea 100644
--- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_reflection_XSingletonTypeDescription_idl__
#define __com_sun_star_reflection_XSingletonTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XServiceTypeDescription_idl__
#include <com/sun/star/reflection/XServiceTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XTypeDescription.idl b/udkapi/com/sun/star/reflection/XTypeDescription.idl
index 98edb32ad..03e130994 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescription.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#define __com_sun_star_reflection_XTypeDescription_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
index 4a45de3de..62d985731 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
#define __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
#include <com/sun/star/container/XEnumeration.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
index 7617b1f11..ef991296c 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
#define __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
#include <com/sun/star/reflection/XTypeDescriptionEnumeration.idl>
-#endif
-#ifndef __com_sun_star_reflection_TypeDescriptionSearchDepth_idl__
#include <com/sun/star/reflection/TypeDescriptionSearchDepth.idl>
-#endif
-#ifndef __com_sun_star_reflection_NoSuchTypeNameException_idl__
#include <com/sun/star/reflection/NoSuchTypeNameException.idl>
-#endif
#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
#include <com/sun/star/reflection/InvalidTypeNameException.idl>
#endif
diff --git a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
index 03e949bed..29bd5b7f1 100644
--- a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_reflection_XUnionTypeDescription_idl__
#define __com_sun_star_reflection_XUnionTypeDescription_idl__
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
index 7d1106d25..360882914 100644
--- a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
+++ b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
#define __com_sun_star_registry_CannotRegisterImplementationException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/DefaultRegistry.idl b/udkapi/com/sun/star/registry/DefaultRegistry.idl
index 32fa53fcc..78f45d854 100644
--- a/udkapi/com/sun/star/registry/DefaultRegistry.idl
+++ b/udkapi/com/sun/star/registry/DefaultRegistry.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_DefaultRegistry_idl__
#define __com_sun_star_registry_DefaultRegistry_idl__
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 51e768f74..e69b6c669 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_ImplementationRegistration_idl__
#define __com_sun_star_registry_ImplementationRegistration_idl__
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
#include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/InvalidRegistryException.idl b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
index 43e78cb71..8efeef6f2 100644
--- a/udkapi/com/sun/star/registry/InvalidRegistryException.idl
+++ b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
#define __com_sun_star_registry_InvalidRegistryException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/InvalidValueException.idl b/udkapi/com/sun/star/registry/InvalidValueException.idl
index 177eb8f89..cbb0d065e 100644
--- a/udkapi/com/sun/star/registry/InvalidValueException.idl
+++ b/udkapi/com/sun/star/registry/InvalidValueException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_InvalidValueException_idl__
#define __com_sun_star_registry_InvalidValueException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl
index f70926ac4..f32e0c181 100644
--- a/udkapi/com/sun/star/registry/MergeConflictException.idl
+++ b/udkapi/com/sun/star/registry/MergeConflictException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_MergeConflictException_idl__
#define __com_sun_star_registry_MergeConflictException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/NestedRegistry.idl b/udkapi/com/sun/star/registry/NestedRegistry.idl
index c73876257..cd90bfc2a 100644
--- a/udkapi/com/sun/star/registry/NestedRegistry.idl
+++ b/udkapi/com/sun/star/registry/NestedRegistry.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_registry_DefaultRegistry_idl__
#define __com_sun_star_registry_DefaultRegistry_idl__
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index 6110ad16b..dd1f8a392 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_SimpleRegistry_idl__
#define __com_sun_star_registry_SimpleRegistry_idl__
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration.idl b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
index 9577a0597..5baae7b1b 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
#define __com_sun_star_registry_XImplementationRegistration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
#include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
index f570a0e1e..a0489d96d 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_registry_XImplementationRegistration2_idl__
#define __com_sun_star_registry_XImplementationRegistration2_idl__
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
#include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
//=============================================================================
module com { module sun { module star { module registry {
diff --git a/udkapi/com/sun/star/registry/XRegistryKey.idl b/udkapi/com/sun/star/registry/XRegistryKey.idl
index 5b31ebb7e..73f1de15c 100644
--- a/udkapi/com/sun/star/registry/XRegistryKey.idl
+++ b/udkapi/com/sun/star/registry/XRegistryKey.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_registry_XRegistryKey_idl__
#define __com_sun_star_registry_XRegistryKey_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
#include <com/sun/star/registry/InvalidRegistryException.idl>
-#endif
-
-#ifndef __com_sun_star_registry_RegistryKeyType_idl__
#include <com/sun/star/registry/RegistryKeyType.idl>
-#endif
-
-#ifndef __com_sun_star_registry_RegistryValueType_idl__
#include <com/sun/star/registry/RegistryValueType.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidValueException_idl__
#include <com/sun/star/registry/InvalidValueException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/registry/XSimpleRegistry.idl b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
index 8dc83b2a9..a345823f8 100644
--- a/udkapi/com/sun/star/registry/XSimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
#define __com_sun_star_registry_XSimpleRegistry_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
#include <com/sun/star/registry/InvalidRegistryException.idl>
-#endif
-
-#ifndef __com_sun_star_registry_XRegistryKey_idl__
#include <com/sun/star/registry/XRegistryKey.idl>
-#endif
-
-#ifndef __com_sun_star_registry_MergeConflictException_idl__
#include <com/sun/star/registry/MergeConflictException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/AllEventObject.idl b/udkapi/com/sun/star/script/AllEventObject.idl
index 2971baadc..6781365da 100644
--- a/udkapi/com/sun/star/script/AllEventObject.idl
+++ b/udkapi/com/sun/star/script/AllEventObject.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_AllEventObject_idl__
#define __com_sun_star_script_AllEventObject_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index 439e1e249..76a2771b8 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_AllListenerAdapter_idl__
#define __com_sun_star_script_AllListenerAdapter_idl__
-#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
#include <com/sun/star/script/XAllListenerAdapterService.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 32c361c58..9f73d6e30 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_XArrayWrapper_idl__
#define __com_sun_star_script_XArrayWrapper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module script {
diff --git a/udkapi/com/sun/star/script/BasicErrorException.idl b/udkapi/com/sun/star/script/BasicErrorException.idl
index 53f45fc8c..c9c368cc6 100644
--- a/udkapi/com/sun/star/script/BasicErrorException.idl
+++ b/udkapi/com/sun/star/script/BasicErrorException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_BasicErrorException_idl__
#define __com_sun_star_script_BasicErrorException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/CannotConvertException.idl b/udkapi/com/sun/star/script/CannotConvertException.idl
index d84bef12a..e1af0431e 100644
--- a/udkapi/com/sun/star/script/CannotConvertException.idl
+++ b/udkapi/com/sun/star/script/CannotConvertException.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_CannotConvertException_idl__
#define __com_sun_star_script_CannotConvertException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
index ea52c590b..0a9c1769e 100644
--- a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
+++ b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
#define __com_sun_star_script_CannotCreateAdapterException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/Converter.idl b/udkapi/com/sun/star/script/Converter.idl
index 11d2aa6f6..f5513ec41 100644
--- a/udkapi/com/sun/star/script/Converter.idl
+++ b/udkapi/com/sun/star/script/Converter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_Converter_idl__
#define __com_sun_star_script_Converter_idl__
-#ifndef __com_sun_star_script_XTypeConverter_idl__
#include <com/sun/star/script/XTypeConverter.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/Engine.idl b/udkapi/com/sun/star/script/Engine.idl
index 1a5ec2811..88423a1bf 100644
--- a/udkapi/com/sun/star/script/Engine.idl
+++ b/udkapi/com/sun/star/script/Engine.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_Engine_idl__
#define __com_sun_star_script_Engine_idl__
-#ifndef __com_sun_star_script_XEngine_idl__
#include <com/sun/star/script/XEngine.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/FinishEngineEvent.idl b/udkapi/com/sun/star/script/FinishEngineEvent.idl
index 2481bbcf9..b9332e97e 100644
--- a/udkapi/com/sun/star/script/FinishEngineEvent.idl
+++ b/udkapi/com/sun/star/script/FinishEngineEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_FinishEngineEvent_idl__
#define __com_sun_star_script_FinishEngineEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_script_FinishReason_idl__
#include <com/sun/star/script/FinishReason.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/InterruptEngineEvent.idl b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
index 0458adf2a..f298d4b33 100644
--- a/udkapi/com/sun/star/script/InterruptEngineEvent.idl
+++ b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_InterruptEngineEvent_idl__
#define __com_sun_star_script_InterruptEngineEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_script_InterruptReason_idl__
#include <com/sun/star/script/InterruptReason.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/Invocation.idl b/udkapi/com/sun/star/script/Invocation.idl
index 69511c6d3..f14e9faa7 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_Invocation_idl__
#define __com_sun_star_script_Invocation_idl__
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
index baa526ace..9f28cd110 100644
--- a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_script_InvocationAdapterFactory_idl__
#define __com_sun_star_script_InvocationAdapterFactory_idl__
-#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
#include <com/sun/star/script/XInvocationAdapterFactory.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
#include <com/sun/star/script/XInvocationAdapterFactory2.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/InvocationInfo.idl b/udkapi/com/sun/star/script/InvocationInfo.idl
index 2554182b4..85dc0687f 100644
--- a/udkapi/com/sun/star/script/InvocationInfo.idl
+++ b/udkapi/com/sun/star/script/InvocationInfo.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_InvocationInfo_idl__
#define __com_sun_star_script_InvocationInfo_idl__
-#ifndef __com_sun_star_script_MemberType_idl__
#include <com/sun/star/script/MemberType.idl>
-#endif
-#ifndef __com_sun_star_reflection_ParamMode_idl__
#include <com/sun/star/reflection/ParamMode.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/JavaScript.idl b/udkapi/com/sun/star/script/JavaScript.idl
index b4c3ccee7..a209b7778 100644
--- a/udkapi/com/sun/star/script/JavaScript.idl
+++ b/udkapi/com/sun/star/script/JavaScript.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_JavaScript_idl__
#define __com_sun_star_script_JavaScript_idl__
-#ifndef __com_sun_star_script_Engine_idl__
#include <com/sun/star/script/Engine.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/ScriptEvent.idl b/udkapi/com/sun/star/script/ScriptEvent.idl
index 471057732..c81e316e7 100644
--- a/udkapi/com/sun/star/script/ScriptEvent.idl
+++ b/udkapi/com/sun/star/script/ScriptEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_ScriptEvent_idl__
#define __com_sun_star_script_ScriptEvent_idl__
-#ifndef __com_sun_star_script_AllEventObject_idl__
#include <com/sun/star/script/AllEventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XAllListener.idl b/udkapi/com/sun/star/script/XAllListener.idl
index 6b0c2521d..de88027e8 100644
--- a/udkapi/com/sun/star/script/XAllListener.idl
+++ b/udkapi/com/sun/star/script/XAllListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_script_XAllListener_idl__
#define __com_sun_star_script_XAllListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_script_AllEventObject_idl__
#include <com/sun/star/script/AllEventObject.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
index fc0b83f40..1c79bca33 100644
--- a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
+++ b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
#define __com_sun_star_script_XAllListenerAdapterService_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_script_XAllListener_idl__
#include <com/sun/star/script/XAllListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XAutomationInvocation.idl b/udkapi/com/sun/star/script/XAutomationInvocation.idl
index f1a758dc9..1d430f6ce 100644
--- a/udkapi/com/sun/star/script/XAutomationInvocation.idl
+++ b/udkapi/com/sun/star/script/XAutomationInvocation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XAutomationInvocation_idl__
#define __com_sun_star_script_XAutomationInvocation_idl__
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
module com { module sun { module star { module script {
diff --git a/udkapi/com/sun/star/script/XDebugging.idl b/udkapi/com/sun/star/script/XDebugging.idl
index 67c09308d..80dce4566 100644
--- a/udkapi/com/sun/star/script/XDebugging.idl
+++ b/udkapi/com/sun/star/script/XDebugging.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_XDebugging_idl__
#define __com_sun_star_script_XDebugging_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_ContextInformation_idl__
#include <com/sun/star/script/ContextInformation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XDefaultMethod.idl b/udkapi/com/sun/star/script/XDefaultMethod.idl
index f94c8ff82..e355cef5f 100644
--- a/udkapi/com/sun/star/script/XDefaultMethod.idl
+++ b/udkapi/com/sun/star/script/XDefaultMethod.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_XDefaultMethod_idl__
#define __com_sun_star_script_XDefaultMethod_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module script {
//==============================================================================
diff --git a/udkapi/com/sun/star/script/XDefaultProperty.idl b/udkapi/com/sun/star/script/XDefaultProperty.idl
index 6e8a92a0c..c9e903042 100644
--- a/udkapi/com/sun/star/script/XDefaultProperty.idl
+++ b/udkapi/com/sun/star/script/XDefaultProperty.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_script_XDefaultProperty_idl__
#define __com_sun_star_script_XDefaultProperty_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module script {
//==============================================================================
diff --git a/udkapi/com/sun/star/script/XDirectInvocation.idl b/udkapi/com/sun/star/script/XDirectInvocation.idl
index 3396bb05e..957954a5e 100644
--- a/udkapi/com/sun/star/script/XDirectInvocation.idl
+++ b/udkapi/com/sun/star/script/XDirectInvocation.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_script_XDirectInvocation_idl__
#define __com_sun_star_script_XDirectInvocation_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_script_CannotConvertException_idl__
#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XEngine.idl b/udkapi/com/sun/star/script/XEngine.idl
index 941ec8e81..275b8cc08 100644
--- a/udkapi/com/sun/star/script/XEngine.idl
+++ b/udkapi/com/sun/star/script/XEngine.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_script_XEngine_idl__
#define __com_sun_star_script_XEngine_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XLibraryAccess_idl__
#include <com/sun/star/script/XLibraryAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XEngineListener_idl__
#include <com/sun/star/script/XEngineListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XEngineListener.idl b/udkapi/com/sun/star/script/XEngineListener.idl
index 4ed0921c7..44ec1d030 100644
--- a/udkapi/com/sun/star/script/XEngineListener.idl
+++ b/udkapi/com/sun/star/script/XEngineListener.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_script_XEngineListener_idl__
#define __com_sun_star_script_XEngineListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_script_InterruptEngineEvent_idl__
#include <com/sun/star/script/InterruptEngineEvent.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_script_FinishEngineEvent_idl__
#include <com/sun/star/script/FinishEngineEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XErrorQuery.idl b/udkapi/com/sun/star/script/XErrorQuery.idl
index 9a1860eaa..c1c881be6 100644
--- a/udkapi/com/sun/star/script/XErrorQuery.idl
+++ b/udkapi/com/sun/star/script/XErrorQuery.idl
@@ -1,9 +1,7 @@
#ifndef __com_sun_star_script_XErrorQuery_idl__
#define __com_sun_star_script_XErrorQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module script {
//==============================================================================
diff --git a/udkapi/com/sun/star/script/XEventAttacher.idl b/udkapi/com/sun/star/script/XEventAttacher.idl
index 46c9cfdb5..3690478cd 100644
--- a/udkapi/com/sun/star/script/XEventAttacher.idl
+++ b/udkapi/com/sun/star/script/XEventAttacher.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_script_XEventAttacher_idl__
#define __com_sun_star_script_XEventAttacher_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_script_XAllListener_idl__
#include <com/sun/star/script/XAllListener.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
#include <com/sun/star/beans/IntrospectionException.idl>
-#endif
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
#include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XEventAttacherManager.idl b/udkapi/com/sun/star/script/XEventAttacherManager.idl
index 5602377c8..79365ef97 100644
--- a/udkapi/com/sun/star/script/XEventAttacherManager.idl
+++ b/udkapi/com/sun/star/script/XEventAttacherManager.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#define __com_sun_star_script_XEventAttacherManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
#include <com/sun/star/script/ScriptEventDescriptor.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
-#ifndef __com_sun_star_script_XScriptListener_idl__
#include <com/sun/star/script/XScriptListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocation.idl b/udkapi/com/sun/star/script/XInvocation.idl
index 27dda9e35..0619fd8ca 100644
--- a/udkapi/com/sun/star/script/XInvocation.idl
+++ b/udkapi/com/sun/star/script/XInvocation.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_script_XInvocation_idl__
#define __com_sun_star_script_XInvocation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
#include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_script_CannotConvertException_idl__
#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocation2.idl b/udkapi/com/sun/star/script/XInvocation2.idl
index 83b579d49..44851ef44 100644
--- a/udkapi/com/sun/star/script/XInvocation2.idl
+++ b/udkapi/com/sun/star/script/XInvocation2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_XInvocation2_idl__
#define __com_sun_star_script_XInvocation2_idl__
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
-#ifndef __com_sun_star_script_InvocationInfo_idl__
#include <com/sun/star/script/InvocationInfo.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
index 899313502..477e69b42 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
#define __com_sun_star_script_XInvocationAdapterFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
index 3651c1921..e809de082 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
#define __com_sun_star_script_XInvocationAdapterFactory2_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XLibraryAccess.idl b/udkapi/com/sun/star/script/XLibraryAccess.idl
index 34a2535de..409425d0c 100644
--- a/udkapi/com/sun/star/script/XLibraryAccess.idl
+++ b/udkapi/com/sun/star/script/XLibraryAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XLibraryAccess_idl__
#define __com_sun_star_script_XLibraryAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
index d9094f7d3..08975e838 100644
--- a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
@@ -27,28 +27,16 @@
#ifndef __com_sun_star_script_XScriptEventsAttacher_idl__
#define __com_sun_star_script_XScriptEventsAttacher_idl__
-#ifndef __com_sun_star_script_XScriptListener_idl__
#include <com/sun/star/script/XScriptListener.idl>
-#endif
-#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_beans_IntrospectionException_idl__
#include <com/sun/star/beans/IntrospectionException.idl>
-#endif
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
#include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
index 802bd1a35..7b42bf388 100644
--- a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_script_XScriptEventsSupplier_idl__
#define __com_sun_star_script_XScriptEventsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptListener.idl b/udkapi/com/sun/star/script/XScriptListener.idl
index 2cc6c7c28..b345ce1cd 100644
--- a/udkapi/com/sun/star/script/XScriptListener.idl
+++ b/udkapi/com/sun/star/script/XScriptListener.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_script_XScriptListener_idl__
#define __com_sun_star_script_XScriptListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_script_ScriptEvent_idl__
#include <com/sun/star/script/ScriptEvent.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicAccess.idl b/udkapi/com/sun/star/script/XStarBasicAccess.idl
index 030d7fb2c..b333e946d 100644
--- a/udkapi/com/sun/star/script/XStarBasicAccess.idl
+++ b/udkapi/com/sun/star/script/XStarBasicAccess.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XStarBasicAccess_idl__
#define __com_sun_star_script_XStarBasicAccess_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
index b9a715ce5..ae8bcd488 100644
--- a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XStarBasicDialogInfo_idl__
#define __com_sun_star_script_XStarBasicDialogInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
index 44477773a..f9b37bf69 100644
--- a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XStarBasicLibraryInfo_idl__
#define __com_sun_star_script_XStarBasicLibraryInfo_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
index b2e70fcc3..d839c9308 100644
--- a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_script_XStarBasicModuleInfo_idl__
#define __com_sun_star_script_XStarBasicModuleInfo_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/script/XTypeConverter.idl b/udkapi/com/sun/star/script/XTypeConverter.idl
index 12b90f103..6511dcbfd 100644
--- a/udkapi/com/sun/star/script/XTypeConverter.idl
+++ b/udkapi/com/sun/star/script/XTypeConverter.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_script_XTypeConverter_idl__
#define __com_sun_star_script_XTypeConverter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_script_CannotConvertException_idl__
#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
#include <com/sun/star/uno/TypeClass.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/AccessControlException.idl b/udkapi/com/sun/star/security/AccessControlException.idl
index 7dd036d4d..7c67914fb 100644
--- a/udkapi/com/sun/star/security/AccessControlException.idl
+++ b/udkapi/com/sun/star/security/AccessControlException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_security_AccessControlException_idl__
#define __com_sun_star_security_AccessControlException_idl__
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 9b74305bf..840ff41aa 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_security_AccessController_idl__
#define __com_sun_star_security_AccessController_idl__
-#ifndef __com_sun_star_security_XAccessController_idl__
#include <com/sun/star/security/XAccessController.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/Policy.idl b/udkapi/com/sun/star/security/Policy.idl
index a5423a831..80c12e49c 100644
--- a/udkapi/com/sun/star/security/Policy.idl
+++ b/udkapi/com/sun/star/security/Policy.idl
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef __com_sun_star_security_Policy_idl__
#define __com_sun_star_security_Policy_idl__
-#ifndef __com_sun_star_security_XPolicy_idl__
#include <com/sun/star/security/XPolicy.idl>
-#endif
module com { module sun { module star { module security {
diff --git a/udkapi/com/sun/star/security/XAccessControlContext.idl b/udkapi/com/sun/star/security/XAccessControlContext.idl
index 2a0a5429f..94d97bb3c 100644
--- a/udkapi/com/sun/star/security/XAccessControlContext.idl
+++ b/udkapi/com/sun/star/security/XAccessControlContext.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_security_XAccessControlContext_idl__
#define __com_sun_star_security_XAccessControlContext_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_security_AccessControlException_idl__
#include <com/sun/star/security/AccessControlException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/XAccessController.idl b/udkapi/com/sun/star/security/XAccessController.idl
index 246cf0997..668441427 100644
--- a/udkapi/com/sun/star/security/XAccessController.idl
+++ b/udkapi/com/sun/star/security/XAccessController.idl
@@ -27,20 +27,10 @@
#ifndef __com_sun_star_security_XAccessController_idl__
#define __com_sun_star_security_XAccessController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_security_XAccessControlContext_idl__
#include <com/sun/star/security/XAccessControlContext.idl>
-#endif
-
-#ifndef __com_sun_star_security_XAction_idl__
#include <com/sun/star/security/XAction.idl>
-#endif
-
-#ifndef __com_sun_star_security_AccessControlException_idl__
#include <com/sun/star/security/AccessControlException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/XAction.idl b/udkapi/com/sun/star/security/XAction.idl
index 4e961b99e..285c65a0f 100644
--- a/udkapi/com/sun/star/security/XAction.idl
+++ b/udkapi/com/sun/star/security/XAction.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_security_XAction_idl__
#define __com_sun_star_security_XAction_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/security/XPolicy.idl b/udkapi/com/sun/star/security/XPolicy.idl
index 57f9afe4d..b5234f297 100644
--- a/udkapi/com/sun/star/security/XPolicy.idl
+++ b/udkapi/com/sun/star/security/XPolicy.idl
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef __com_sun_star_security_XPolicy_idl__
#define __com_sun_star_security_XPolicy_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module security {
diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl
index e3f675472..158e33372 100644
--- a/udkapi/com/sun/star/task/XInteractionAbort.idl
+++ b/udkapi/com/sun/star/task/XInteractionAbort.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionAbort_idl__
#define __com_sun_star_task_XInteractionAbort_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl
index a56690090..462cfad5b 100644
--- a/udkapi/com/sun/star/task/XInteractionContinuation.idl
+++ b/udkapi/com/sun/star/task/XInteractionContinuation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#define __com_sun_star_task_XInteractionContinuation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl
index 32c71a43a..66dcf18d3 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_task_XInteractionHandler_idl__
#define __com_sun_star_task_XInteractionHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
#include <com/sun/star/task/XInteractionRequest.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index fff12ae1f..381edbaf5 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionHandler2_idl__
#define __com_sun_star_task_XInteractionHandler2_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl
index 4141c90d4..b9f2889fe 100644
--- a/udkapi/com/sun/star/task/XInteractionRequest.idl
+++ b/udkapi/com/sun/star/task/XInteractionRequest.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_task_XInteractionRequest_idl__
#define __com_sun_star_task_XInteractionRequest_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl
index dc0c4e7e2..92568d17a 100644
--- a/udkapi/com/sun/star/task/XInteractionRetry.idl
+++ b/udkapi/com/sun/star/task/XInteractionRetry.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_task_XInteractionRetry_idl__
#define __com_sun_star_task_XInteractionRetry_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/test/TestEvent.idl b/udkapi/com/sun/star/test/TestEvent.idl
index cc224499c..0291faa9b 100644
--- a/udkapi/com/sun/star/test/TestEvent.idl
+++ b/udkapi/com/sun/star/test/TestEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_test_TestEvent_idl__
#define __com_sun_star_test_TestEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/test/TestFactory.idl b/udkapi/com/sun/star/test/TestFactory.idl
index 076b4248b..f7c872c02 100644
--- a/udkapi/com/sun/star/test/TestFactory.idl
+++ b/udkapi/com/sun/star/test/TestFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_test_TestFactory_idl__
#define __com_sun_star_test_TestFactory_idl__
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
#include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/test/XSimpleTest.idl b/udkapi/com/sun/star/test/XSimpleTest.idl
index 4be670675..daf2ecb8c 100644
--- a/udkapi/com/sun/star/test/XSimpleTest.idl
+++ b/udkapi/com/sun/star/test/XSimpleTest.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_test_XSimpleTest_idl__
#define __com_sun_star_test_XSimpleTest_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/udkapi/com/sun/star/test/XTest.idl b/udkapi/com/sun/star/test/XTest.idl
index e80b6367f..ba517df38 100644
--- a/udkapi/com/sun/star/test/XTest.idl
+++ b/udkapi/com/sun/star/test/XTest.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_test_XTest_idl__
#define __com_sun_star_test_XTest_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_test_XTestListener_idl__
#include <com/sun/star/test/XTestListener.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/test/XTestListener.idl b/udkapi/com/sun/star/test/XTestListener.idl
index c74321f52..7eee29e93 100644
--- a/udkapi/com/sun/star/test/XTestListener.idl
+++ b/udkapi/com/sun/star/test/XTestListener.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_test_XTestListener_idl__
#define __com_sun_star_test_XTestListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_test_TestEvent_idl__
#include <com/sun/star/test/TestEvent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
index cebece6de..da41e822f 100644
--- a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
+++ b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_test_bridge_XBridge_idl__
#define __com_sun_star_test_bridge_XBridge_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
module com
{
diff --git a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
index ace0f4d10..7a68a68c5 100644
--- a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
+++ b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_test_performance_XPerformanceTest_idl__
#define __com_sun_star_test_performance_XPerformanceTest_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com
{
diff --git a/udkapi/com/sun/star/uno/DeploymentException.idl b/udkapi/com/sun/star/uno/DeploymentException.idl
index abdf95875..362f848cf 100644
--- a/udkapi/com/sun/star/uno/DeploymentException.idl
+++ b/udkapi/com/sun/star/uno/DeploymentException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_DeploymentException_idl__
#define __com_sun_star_uno_DeploymentException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/Exception.idl b/udkapi/com/sun/star/uno/Exception.idl
index 7308f4899..202330c05 100644
--- a/udkapi/com/sun/star/uno/Exception.idl
+++ b/udkapi/com/sun/star/uno/Exception.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_Exception_idl__
#define __com_sun_star_uno_Exception_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl
index f4cdac498..6e4a67fbf 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_NamingService_idl__
#define __com_sun_star_uno_NamingService_idl__
-#ifndef __com_sun_star_uno_XNamingService_idl__
#include <com/sun/star/uno/XNamingService.idl>
-#endif
module com { module sun { module star { module uno {
diff --git a/udkapi/com/sun/star/uno/RuntimeException.idl b/udkapi/com/sun/star/uno/RuntimeException.idl
index 63e83386b..50919cf1f 100644
--- a/udkapi/com/sun/star/uno/RuntimeException.idl
+++ b/udkapi/com/sun/star/uno/RuntimeException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_RuntimeException_idl__
#define __com_sun_star_uno_RuntimeException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/SecurityException.idl b/udkapi/com/sun/star/uno/SecurityException.idl
index 171388ab6..71fabad40 100644
--- a/udkapi/com/sun/star/uno/SecurityException.idl
+++ b/udkapi/com/sun/star/uno/SecurityException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_SecurityException_idl__
#define __com_sun_star_uno_SecurityException_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/XAdapter.idl b/udkapi/com/sun/star/uno/XAdapter.idl
index 0368bfae2..c80c7eca8 100644
--- a/udkapi/com/sun/star/uno/XAdapter.idl
+++ b/udkapi/com/sun/star/uno/XAdapter.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_uno_XAdapter_idl__
#define __com_sun_star_uno_XAdapter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_XReference_idl__
#include <com/sun/star/uno/XReference.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/XAggregation.idl b/udkapi/com/sun/star/uno/XAggregation.idl
index b2a66b2ab..8e2311a2d 100644
--- a/udkapi/com/sun/star/uno/XAggregation.idl
+++ b/udkapi/com/sun/star/uno/XAggregation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_XAggregation_idl__
#define __com_sun_star_uno_XAggregation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/XComponentContext.idl b/udkapi/com/sun/star/uno/XComponentContext.idl
index 6356b951d..319dba5fd 100644
--- a/udkapi/com/sun/star/uno/XComponentContext.idl
+++ b/udkapi/com/sun/star/uno/XComponentContext.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_XComponentContext_idl__
#define __com_sun_star_uno_XComponentContext_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module lang {
diff --git a/udkapi/com/sun/star/uno/XCurrentContext.idl b/udkapi/com/sun/star/uno/XCurrentContext.idl
index cbb7004d9..d6ba49e22 100644
--- a/udkapi/com/sun/star/uno/XCurrentContext.idl
+++ b/udkapi/com/sun/star/uno/XCurrentContext.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_XCurrentContext_idl__
#define __com_sun_star_uno_XCurrentContext_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module uno {
diff --git a/udkapi/com/sun/star/uno/XNamingService.idl b/udkapi/com/sun/star/uno/XNamingService.idl
index b58872a6b..d9311a935 100644
--- a/udkapi/com/sun/star/uno/XNamingService.idl
+++ b/udkapi/com/sun/star/uno/XNamingService.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_uno_XNamingService_idl__
#define __com_sun_star_uno_XNamingService_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module uno {
diff --git a/udkapi/com/sun/star/uno/XReference.idl b/udkapi/com/sun/star/uno/XReference.idl
index c3b7ad3ad..33e78dc6c 100644
--- a/udkapi/com/sun/star/uno/XReference.idl
+++ b/udkapi/com/sun/star/uno/XReference.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_XReference_idl__
#define __com_sun_star_uno_XReference_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/XUnloadingPreference.idl b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
index c6e40ac34..9701f1f61 100644
--- a/udkapi/com/sun/star/uno/XUnloadingPreference.idl
+++ b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_uno_XUnloadingPreference_idl__
#define __com_sun_star_uno_XUnloadingPreference_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/uno/XWeak.idl b/udkapi/com/sun/star/uno/XWeak.idl
index b240eb038..e02723db6 100644
--- a/udkapi/com/sun/star/uno/XWeak.idl
+++ b/udkapi/com/sun/star/uno/XWeak.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_uno_XWeak_idl__
#define __com_sun_star_uno_XWeak_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_XAdapter_idl__
#include <com/sun/star/uno/XAdapter.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
index e57278d5a..054c57fe9 100644
--- a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
+++ b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_BootstrapMacroExpander_idl__
#define __com_sun_star_util_BootstrapMacroExpander_idl__
-#ifndef __com_sun_star_util_MacroExpander_idl__
#include <com/sun/star/util/MacroExpander.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/MacroExpander.idl b/udkapi/com/sun/star/util/MacroExpander.idl
index 511c96310..f77f186d2 100644
--- a/udkapi/com/sun/star/util/MacroExpander.idl
+++ b/udkapi/com/sun/star/util/MacroExpander.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_MacroExpander_idl__
#define __com_sun_star_util_MacroExpander_idl__
-#ifndef __com_sun_star_util_XMacroExpander_idl__
#include <com/sun/star/util/XMacroExpander.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/XMacroExpander.idl b/udkapi/com/sun/star/util/XMacroExpander.idl
index b24a7a6b5..95c9a4494 100644
--- a/udkapi/com/sun/star/util/XMacroExpander.idl
+++ b/udkapi/com/sun/star/util/XMacroExpander.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XMacroExpander_idl__
#define __com_sun_star_util_XMacroExpander_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/udkapi/com/sun/star/util/XVeto.idl b/udkapi/com/sun/star/util/XVeto.idl
index 66c7cd792..060802364 100644
--- a/udkapi/com/sun/star/util/XVeto.idl
+++ b/udkapi/com/sun/star/util/XVeto.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XVeto_idl__
#define __com_sun_star_util_XVeto_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl b/udkapi/com/sun/star/util/logging/Logger.idl
index dd98daa23..d11cdd07f 100644
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ b/udkapi/com/sun/star/util/logging/Logger.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_webtop_Logger_idl__
#define __com_sun_star_webtop_Logger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLogger_idl__
#include <XLogger.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
#include <XLoggerRemote.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 70966d098..62feed481 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_webtop_Logger_idl__
#define __com_sun_star_webtop_Logger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLogger_idl__
#include <XLogger.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
#include <XLoggerRemote.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/logging/XLogger.idl b/udkapi/com/sun/star/util/logging/XLogger.idl
index 06b8773a6..4333cc531 100644
--- a/udkapi/com/sun/star/util/logging/XLogger.idl
+++ b/udkapi/com/sun/star/util/logging/XLogger.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_logging_XLogger_idl__
#define __com_sun_star_util_logging_XLogger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
index 4b99302e7..27e1e2e82 100644
--- a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
#define __com_sun_star_util_logging_XLoggerRemote_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
//=============================================================================