summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/xml
diff options
context:
space:
mode:
Diffstat (limited to 'offapi/com/sun/star/xml')
-rw-r--r--offapi/com/sun/star/xml/AttributeContainer.idl2
-rw-r--r--offapi/com/sun/star/xml/ExportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/ImportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/NamespaceContainer.idl2
-rw-r--r--offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/XExportFilter.idl3
-rw-r--r--offapi/com/sun/star/xml/XImportFilter.idl3
-rw-r--r--offapi/com/sun/star/xml/XMLExportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/XMLImportFilter.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/SEInitializer.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryption.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignature.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureException.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl3
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryption.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignature.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl1
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Decryptor.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Encryptor.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl1
-rw-r--r--offapi/com/sun/star/xml/dom/DOMException.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/DocumentBuilder.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XAttr.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCDATASection.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCharacterData.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XComment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDOMImplementation.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XDocument.idl18
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentBuilder.idl19
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentFragment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentType.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XElement.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XEntity.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XEntityReference.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XNamedNodeMap.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XNode.idl8
-rw-r--r--offapi/com/sun/star/xml/dom/XNodeList.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XNotation.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XProcessingInstruction.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl9
-rw-r--r--offapi/com/sun/star/xml/dom/XText.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/EventException.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/XMutationEvent.idl1
-rw-r--r--offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/FastToken.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/InputSource.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXParseException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XAttributeList.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDTDHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDocumentHandler.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/XEntityResolver.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XErrorHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XFastAttributeList.idl11
-rw-r--r--offapi/com/sun/star/xml/sax/XFastContextHandler.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl12
-rw-r--r--offapi/com/sun/star/xml/sax/XFastParser.idl24
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl11
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSerializer.idl15
-rw-r--r--offapi/com/sun/star/xml/sax/XFastTokenHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XLocator.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XParser.idl18
-rw-r--r--offapi/com/sun/star/xml/sax/XSAXSerializable.idl5
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl2
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathAPI.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathException.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathExtension.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathAPI.idl12
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathExtension.idl4
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathObject.idl8
88 files changed, 0 insertions, 351 deletions
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index cd4c9dec0a6b..d47fdc266d3b 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index 21b5ece2b6d1..3531b649df97 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#include <com/sun/star/xml/XExportFilter.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index d95c7c099bf3..82b6f1a91cf6 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#include <com/sun/star/xml/XImportFilter.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 03319c029fa4..77d6224cd6ce 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 9d85e30bb255..eb230ecbba6a 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index cde995ba8872..f0022b1a0d96 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index 515ed93f7b07..105867aecf1f 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a90a0f06609..24224119b645 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index 89e597977f35..caa0364ab750 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index 68646ba9f982..f952a01b91b4 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index c66b6cb3bc60..81b94a27ce44 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_xml_XMLExportFilter_idl__
-#ifndef __com_sun_star_document_ExportFilter_idl__
#include <com/sun/star/document/ExportFilter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index 6e551859f720..05cf2718e264 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -29,13 +29,8 @@
#define __com_sun_star_xml_XMLImportFilter_idl__
-#ifndef __com_sun_star_document_ImportFilter_idl__
#include <com/sun/star/document/ImportFilter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index 1f914194f45e..c6f9c4c825d7 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XSEInitializer.idl>
-
#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index a2ed14038934..4cefdc02a94e 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 9e664894ee1e..c48c87ddf84f 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index a379bfc84386..292bf71db8e9 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
#define __com_sun_star_xml_crypto_XMLEncryptionException_idl__
-#ifndef __com_sun_star_security_EncryptionException_idl__
#include <com/sun/star/security/EncryptionException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 1d512dcd31d8..2b4922678795 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index 9acf52b38802..dc9a7665ab27 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 8eea2d51e62e..dddccae400d0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignature.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 193c5417db43..ab0613f56026 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -32,9 +32,7 @@
#ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
#define __com_sun_star_xml_crypto_XMLSignatureException_idl__
-#ifndef __com_sun_star_security_SignatureException_idl__
#include <com/sun/star/security/SignatureException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 0116afa64006..18379a0c58a5 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 25d7264c22d3..b8743599c0a0 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -32,10 +32,7 @@
#ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
#define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/security/XCertificate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 8af4769c362e..26ef95f118b9 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -35,13 +35,11 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLEncryptionException.idl>
-
module com { module sun { module star { module xml { module crypto {
/**
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index 6953ba743c71..459104e357df 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 7ab002c21e1d..ec9190cf6a3e 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/security/SecurityInfrastructureException.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index 28180a2a23ec..66f4a1b4d2a6 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/SecurityOperationStatus.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index 8d9d5e44706c..325531fadab1 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLSignatureException.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index f89542c02f77..c5ad60db790a 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index c3f2d095e208..1e51568d0628 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XBlockerMonitor.idl"
#include "XDecryptionResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 7c37884f4fbd..536efe61c831 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XBlockerMonitor.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 28fc6e8bf037..a85d9dcc0af9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -34,11 +34,9 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XSecuritySAXEventKeeper.idl"
#include "XReferenceResolvedBroadcaster.idl"
#include "XSAXEventKeeperStatusChangeBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 65622d20ff5e..0cf2cc075a13 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -35,9 +35,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureCreationResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index 6e78a9340431..2b06ae7b07f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -36,9 +36,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureVerifyResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index 30f53c30ee0a..d59e037934ab 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index d344af889bbe..3e5857c32f19 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_DOMException_idl__
#define __com_sun_star_xml_dom_DOMException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
#include <com/sun/star/xml/dom/DOMExceptionType.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
index 0804dc6df201..d280f01833ab 100644
--- a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_dom_xdocumentbuilder_idl
#include <com/sun/star/xml/dom/XDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
service DocumentBuilder
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4c9dffd36dda..c530d479ead2 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,11 +1,7 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_sax_xdocumenthandler_idl
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl
#include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 7d4a010e3723..6737645e0ac7 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XAttr_idl__
#define __com_sun_star_xml_sax_XAttr_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index a484ccabca34..dae54a750922 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#define __com_sun_star_xml_dom_XCDATASection_idl__
-#ifndef __com_sun_star_xml_dom_XText_idl__
#include <com/sun/star/xml/dom/XText.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index 380c705d6359..af2767faa3d6 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#define __com_sun_star_xml_dom_XCharacterData_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 36a6a6e6afe7..95fd6ebeb199 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XComment_idl__
#define __com_sun_star_xml_dom_XCComment_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index f8003fce26e2..56f7ceda68e6 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#define __com_sun_star_xml_dom_XDOMImplementation_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 6bd105d8e06c..d64eb18fc290 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -28,33 +28,15 @@
#ifndef __com_sun_star_xml_dom_XDocument_idl__
#define __com_sun_star_xml_dom_XDocument_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#include <com/sun/star/xml/dom/XCDATASection.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__
#include <com/sun/star/xml/dom/XComment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
#include <com/sun/star/xml/dom/XEntityReference.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#include <com/sun/star/xml/dom/XProcessingInstruction.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index e2245e9d3153..a72625c6cfd6 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -28,35 +28,16 @@
#ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index cbc8af63b923..5a48224e4b23 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#define __com_sun_star_xml_dom_XDocumentFragment_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index ce6495214bcf..cd4c46573ce5 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#define __com_sun_star_xml_dom_XDocumentType_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index dc0373467a53..f0869b708124 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XElement_idl__
#define __com_sun_star_xml_dom_XElement_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 7396a42aa190..3352ae002a49 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntety_idl__
#define __com_sun_star_xml_dom_XEntety_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index cec97fdf0219..9650fbe55854 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
#define __com_sun_star_xml_dom_XEntetyReference_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index df7ed658ad56..c09a63e0c83b 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#define __com_sun_star_xml_dom_XNamedNodeMap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index 7f7ffc14aa0e..b60a24796f52 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_dom_XNode_idl__
#define __com_sun_star_xml_dom_XNode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__
#include <com/sun/star/xml/dom/NodeType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index 7c8ae6c85326..13ae64f35628 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#define __com_sun_star_xml_dom_XNodeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index 6198cdd491e9..415e7da0d5d6 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNotation_idl__
#define __com_sun_star_xml_dom_XNotation_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 48277fc4a5c8..cf329f8c3988 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#define __com_sun_star_xml_dom_XProcessingInstruction_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index 05fafa20fc9f..7b84712eb06e 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -28,19 +28,10 @@
#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__
#include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 8d12d1466cdd..bc009f2f65cd 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XText_idl__
#define __com_sun_star_xml_dom_XText_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index e05e7c7623d2..e1a04208037c 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_dom_events_EventException_idl__
#define __com_sun_star_xml_dom_events_EventException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index 724ea388fd75..f1ccdde43798 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -32,7 +32,6 @@
#include <com/sun/star/xml/dom/events/XEvent.idl>
#include <com/sun/star/xml/dom/events/XEventTarget.idl>
#include <com/sun/star/xml/dom/events/XEventListener.idl>
-
#include <com/sun/star/xml/dom/XNode.idl>
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index fae70b3c84c0..c5d1b7ab4b7b 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_FastShapeContextHandler_idl__
#define __com_sun_star_xml_sax_FastShapeContextHandler_idl__
-#ifndef __com_sun_star_xml_sax_XFastShapeContextHandler_idl__
#include <com/sun/star/xml/sax/XFastShapeContextHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index baec31bb7fb9..9a1d74bf4da8 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastToken_idl__
#define __com_sun_star_xml_sax_XFastToken_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index d9004b08b1eb..5445d6dfb294 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_InputSource_idl__
#define __com_sun_star_xml_sax_InputSource_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index e7257352fa45..649403ff0d29 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXException_idl__
#define __com_sun_star_xml_sax_SAXException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index 9b415b3119fb..3f1c6f2a052d 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
#define __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 2c56716fa683..c306472f69ac 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXParseException_idl__
#define __com_sun_star_xml_sax_SAXParseException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index f7b24418410d..e671c6eb997f 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#define __com_sun_star_xml_sax_XAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 184850386f11..44168ac406fc 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#define __com_sun_star_xml_sax_XDTDHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 6586ba99a66b..210b8c6ec557 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#define __com_sun_star_xml_sax_XDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#include <com/sun/star/xml/sax/XAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index 63547e260fa8..c850f3e702e1 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#define __com_sun_star_xml_sax_XEntityResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 2d799fc6afdc..87a4b33dfe8f 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#define __com_sun_star_xml_sax_XErrorHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 5801a22a2517..d1f04f801b4a 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
#define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index ad991568d738..baafcc24e435 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#define __com_sun_star_xml_sax_XFastAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_Attribute_idl__
#include <com/sun/star/xml/Attribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_FastAttribute_idl__
#include <com/sun/star/xml/FastAttribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 1449e3fbc4b5..19c71e696d1a 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#define __com_sun_star_xml_sax_XFastContextHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index af9e2b2aef41..a9e2e74dcced 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -27,25 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#define __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#include <com/sun/star/xml/sax/XFastContextHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index e2e2d1e31418..9aa53a7cc01d 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -27,49 +27,25 @@
#ifndef __com_sun_star_xml_sax_XFastParser_idl__
#define __com_sun_star_xml_sax_XFastParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index 949d8ef2386b..aa35a92a9896 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
#define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Pair_idl__
#include <com/sun/star/beans/Pair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index 5d1591490bb5..fa747d3d8474 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -27,26 +27,11 @@
#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
#define __com_sun_star_xml_sax_XFastSerializer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index 0f1063479edc..68fe416663c8 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#define __com_sun_star_xml_sax_XFastTokenHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index e77d83000f8a..81139a153b1c 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XLocator_idl__
#define __com_sun_star_xml_sax_XLocator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index 0d29af5d6562..bab4475f1229 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -27,41 +27,23 @@
#ifndef __com_sun_star_xml_sax_XParser_idl__
#define __com_sun_star_xml_sax_XParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 94af79fc1444..065fec06668b 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
#define __com_sun_star_xml_sax_XSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index db7753848ff3..e5aa2075e232 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 2dc7103458d9..9f457bff5ac1 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 67d771b3ea66..99842d95492f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathAPI_idl
#include <com/sun/star/xml/xpath/XXPathAPI.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 37ee4eb789bb..2c36d2668745 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#define __com_sun_star_xml_XPath_XPathException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index d286cc0a817e..e5c827b84b2f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index 62ac4c32d984..6a19b545c2da 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_xml_XPath_XXPathAPI_idl__
#define __com_sun_star_xml_XPath_XXPathAPI_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathObject_idl__
#include <com/sun/star/xml/xpath/XXPathObject.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl__
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#include <com/sun/star/xml/xpath/XPathException.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index 527c37ba46f3..016439e6c78e 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_xml_XPath_XXPathExtension_idl__
#define __com_sun_star_xml_XPath_XXPathExtension_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
#include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 8e5f33bbbbe0..a1ef71ff8762 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
#define __com_sun_star_xml_XPath_XXPathObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
#include <com/sun/star/xml/xpath/XPathObjectType.idl>
-#endif
module com { module sun { module star { module xml { module xpath {