tdf#42949 Fix IWYU warnings in xmlsecurity/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I89c77656ea4021cb16bd122cb1dd1cd803390c3d
Reviewed-on: https://gerrit.libreoffice.org/71765
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

xmlsecurity/IwyuFilter_xmlsecurity.yaml

@@ -68,6 +68,9 @@ blacklist:
     - com/sun/star/security/XCertificate.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    xmlsecurity/source/gpg/GpgComponentFactory.cxx:
+    # Silence warning due to incorrect include path
+    - com/sun/star/lang/XSingleServiceFactory.hpp
     xmlsecurity/source/gpg/SecurityEnvironment.hxx:
     # Base class needs complete type
     - com/sun/star/xml/crypto/XSecurityEnvironment.hpp
@@ -95,6 +98,12 @@ blacklist:
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
     - com/sun/star/xml/wrapper/XXMLElementWrapper.hpp
+    xmlsecurity/source/xmlsec/errorcallback.cxx:
+    # Needed for xmlsec/errors.h
+    - xmlsec-wrapper.h
+    xmlsecurity/source/xmlsec/xmlstreamio.cxx:
+    # comphelper::ScopeGuard is in use but not noticed by IWYU
+    - comphelper/scopeguard.hxx
     xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx:
     # Base class needs complete type
     - com/sun/star/security/XSanExtension.hpp
@@ -113,3 +122,11 @@ blacklist:
     - com/sun/star/xml/crypto/XCertificateCreator.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
+    xmlsecurity/source/xmlsec/nss/secerror.cxx:
+    # Used as array initializer
+    - certerrors.h
+    # Needed for macros used by certerrors.h
+    - nss.h
+    xmlsecurity/qa/unit/signing/signing.cxx:
+    # Don't replace URE header with impl. detail
+    - osl/thread.hxx

xmlsecurity/inc/certificateviewer.hxx

@@ -34,6 +34,7 @@ namespace xml { namespace crypto {
 class CertificateViewerGeneralTP;
 class CertificateViewerDetailsTP;
 class CertificateViewerCertPathTP;
+class CertificateChooser;
 
 class CertificateViewer : public weld::GenericDialogController
 {

xmlsecurity/qa/unit/signing/signing.cxx

@@ -13,7 +13,6 @@
 #include <sal/config.h>
 
 #include <cstdlib>
-#include <type_traits>
 
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>

xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx

@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;

xmlsecurity/source/component/certificatecontainer.cxx

@@ -22,13 +22,14 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/security/XCertificateContainer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 
 #include <sal/config.h>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;

xmlsecurity/source/dialogs/certificatechooser.cxx

@@ -20,7 +20,6 @@
 #include <config_gpgme.h>
 #include <certificatechooser.hxx>
 #include <certificateviewer.hxx>
-#include <biginteger.hxx>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 #include <comphelper/sequence.hxx>

xmlsecurity/source/dialogs/macrosecurity.cxx

@@ -19,7 +19,6 @@
 
 
 #include <macrosecurity.hxx>
-#include <certificatechooser.hxx>
 #include <certificateviewer.hxx>
 #include <biginteger.hxx>
 
@@ -28,11 +27,9 @@
 
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <comphelper/sequence.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/xmlsechelper.hxx>
 #include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <tools/diagnose_ex.h>
@@ -41,8 +38,6 @@
 
 #include <vcl/svapp.hxx>
 
-#include <strings.hrc>
-
 using namespace comphelper;
 using namespace ::com::sun::star;
 

xmlsecurity/source/framework/elementcollector.cxx

@@ -20,7 +20,6 @@
 
 #include "elementmark.hxx"
 #include "elementcollector.hxx"
-#include "buffernode.hxx"
 #include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
 #include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
 

xmlsecurity/source/framework/elementmark.cxx

@@ -19,7 +19,6 @@
 
 
 #include "elementmark.hxx"
-#include "buffernode.hxx"
 
 namespace cssxc = com::sun::star::xml::crypto;
 

xmlsecurity/source/framework/saxeventkeeperimpl.cxx

@@ -22,7 +22,6 @@
 #include "buffernode.hxx"
 #include "elementmark.hxx"
 #include "elementcollector.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
 #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>

xmlsecurity/source/framework/securityengine.cxx

@@ -19,7 +19,6 @@
 
 
 #include <framework/securityengine.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 
 SecurityEngine::SecurityEngine()

xmlsecurity/source/framework/signaturecreatorimpl.cxx

@@ -21,12 +21,12 @@
 #include <framework/signaturecreatorimpl.hxx>
 #include <framework/xmlsignaturetemplateimpl.hxx>
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 
+namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
+
 using namespace com::sun::star::uno;
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;

xmlsecurity/source/framework/signatureengine.cxx

@@ -20,10 +20,10 @@
 
 #include <framework/signatureengine.hxx>
 #include <framework/xmlsignaturetemplateimpl.hxx>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ref.hxx>
 
+namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
+
 using namespace com::sun::star::uno;
 namespace cssu = com::sun::star::uno;
 namespace cssxc = com::sun::star::xml::crypto;

xmlsecurity/source/framework/signatureverifierimpl.cxx

@@ -21,8 +21,6 @@
 #include <framework/signatureverifierimpl.hxx>
 #include <framework/xmlsignaturetemplateimpl.hxx>
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>

xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx

@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
 #include <framework/xmlsignaturetemplateimpl.hxx>
 
 using namespace ::com::sun::star::uno ;

xmlsecurity/source/gpg/CertificateImpl.cxx

@@ -19,7 +19,6 @@
 #include <officecfg/Office/Common.hxx>
 #include <svl/sigstruct.hxx>
 
-#include <gpgme.h>
 #include <context.h>
 #include <data.h>
 

xmlsecurity/source/gpg/GpgComponentFactory.cxx

@@ -9,8 +9,6 @@
 
 #include <sal/config.h>
 
-#include <osl/thread.h>
-#include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include "xmlsignature_gpgimpl.hxx"
@@ -18,7 +16,6 @@
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 
 extern "C"
 {

xmlsecurity/source/gpg/SEInitializer.cxx

@@ -7,17 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <config_gpgme.h>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 #include <cppuhelper/supportsservice.hxx>
 #include <gpg/SEInitializer.hxx>
 #include "SecurityEnvironment.hxx"
 #include "XMLSecurityContext.hxx"
 
-#include <gpgme.h>
-#include <context.h>
+#include <global.h>
+
+namespace com::sun::star::uno { class XComponentContext; }
 
 using namespace css;
 using namespace css::lang;

xmlsecurity/source/gpg/SecurityEnvironment.cxx

@@ -7,15 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <config_gpgme.h>
-
 #include "SecurityEnvironment.hxx"
 #include "CertificateImpl.hxx"
 
 #include <com/sun/star/security/CertificateCharacters.hpp>
 #include <com/sun/star/security/CertificateValidity.hpp>
 
-#include <cppuhelper/supportsservice.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <vector>
 

xmlsecurity/source/gpg/XMLSecurityContext.cxx

@@ -8,13 +8,9 @@
  */
 
 #include "XMLSecurityContext.hxx"
-#include "SecurityEnvironment.hxx"
 
 #include <cppuhelper/supportsservice.hxx>
 
-#include <xmlsec/xmlstreamio.hxx>
-#include <xmlsec-wrapper.h>
-
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::xml::crypto;

xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx

@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_gpgme.h>
-
 #include <sal/config.h>
 #include <sal/log.hxx>
-#include <rtl/uuid.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <gpg/xmlsignature_gpgimpl.hxx>
 
@@ -39,7 +36,6 @@
 #include <signingresult.h>
 #include <importresult.h>
 
-#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
 #include <xmlelementwrapper_xmlsecimpl.hxx>
 #include <xmlsec/xmlstreamio.hxx>
 #include <xmlsec/errorcallback.hxx>

xmlsecurity/source/helper/documentsignaturehelper.cxx

@@ -25,12 +25,9 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 

xmlsecurity/source/helper/pdfsignaturehelper.cxx

@@ -18,7 +18,6 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 
-#include <tools/stream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/filter/pdfdocument.hxx>
 

xmlsecurity/source/helper/xmlsignaturehelper.cxx

@@ -24,16 +24,13 @@
 
 #include <xmlsignaturehelper2.hxx>
 
-#include <tools/stream.hxx>
 #include <tools/datetime.hxx>
 
 #include <xmloff/attrlist.hxx>
 
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
@@ -42,7 +39,6 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
 
 #include <comphelper/ofopxmlhelper.hxx>
 #include <comphelper/sequence.hxx>

xmlsecurity/source/helper/xmlsignaturehelper2.cxx

@@ -17,16 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <xmlsignaturehelper.hxx>
 #include <xmlsignaturehelper2.hxx>
 
 #include <tools/solar.h>
 #include <unotools/streamhelper.hxx>
 
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/XStorageRawAccess.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
 #include <rtl/uri.hxx>
 #include <sal/log.hxx>

xmlsecurity/source/helper/xsecctl.cxx

@@ -27,27 +27,19 @@
 # include <gpg/xmlsignature_gpgimpl.hxx>
 #endif
 
-#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
 #include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
-#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.hpp>
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
 #ifdef ANDROID
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
 #endif
-#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
 
 #include <xmloff/attrlist.hxx>
-#include <rtl/math.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
 #include <unotools/datetime.hxx>
-#include <sax/tools/converter.hxx>
 #include "ooxmlsecexporter.hxx"
 #include <xmlsignaturehelper2.hxx>
 

xmlsecurity/source/helper/xsecparser.cxx

@@ -25,8 +25,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <sal/log.hxx>
 
-#include <string.h>
-
 namespace cssu = com::sun::star::uno;
 namespace cssxc = com::sun::star::xml::crypto;
 namespace cssxs = com::sun::star::xml::sax;

xmlsecurity/source/helper/xsecsign.cxx

@@ -19,15 +19,8 @@
 
 
 #include <xsecctl.hxx>
-#include <certificate.hxx>
 
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
-#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
-#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <rtl/uuid.h>
 #include <sal/log.hxx>
@@ -35,6 +28,8 @@
 #include <framework/signaturecreatorimpl.hxx>
 #include <framework/saxeventkeeperimpl.hxx>
 
+namespace com::sun::star::graphic { class XGraphic; }
+
 using namespace css;
 using namespace css::uno;
 using namespace css::graphic;

xmlsecurity/source/helper/xsecverify.cxx

@@ -30,13 +30,10 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp>
 #include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
 #include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
 #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp>
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <sal/log.hxx>
 #include <unotools/datetime.hxx>
@@ -44,6 +41,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
 
+namespace com::sun::star::graphic { class XGraphic; }
+
 using namespace css;
 using namespace css::uno;
 using namespace css::beans;

xmlsecurity/source/xmlsec/nss/digestcontext.hxx

@@ -24,6 +24,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
+#include <secmodt.h>
 
 class ODigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigestContext >
 {

xmlsecurity/source/xmlsec/nss/nssinitializer.cxx

@@ -28,28 +28,25 @@
 #include <rtl/instance.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <sal/log.hxx>
 #include <unotools/tempfile.hxx>
 #include <salhelper/singletonref.hxx>
 
-#include "seinitializer_nssimpl.hxx"
+#include <nss/nssinitializer.hxx>
 
-#include "securityenvironment_nssimpl.hxx"
 #include "digestcontext.hxx"
 #include "ciphercontext.hxx"
 
 #include <memory>
 #include <vector>
 
-#include <nspr.h>
-#include <cert.h>
 #include <nss.h>
 #include <pk11pub.h>
 #include <secmod.h>
-#include <nssckbi.h>
+#include <prerror.h>
+#include <prinit.h>
 
 namespace cssu = css::uno;
 namespace cssl = css::lang;

xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <sal/config.h>
-#include <rtl/uuid.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/security/ExtAltNameType.hpp>
 #include <com/sun/star/security/CertAltNameEntry.hpp>
@@ -27,8 +26,6 @@
 #include <seccomon.h>
 #include <cert.h>
 #include <certt.h>
-#include <secitem.h>
-#include <secport.h>
 
 #include "sanextension_nssimpl.hxx"
 

xmlsecurity/source/xmlsec/nss/secerror.cxx

@@ -20,13 +20,9 @@
 
 #include <secerr.h>
 #include "secerror.hxx"
-#include <sslerr.h>
-#include <nspr.h>
 #include <nss.h>
 #include <certt.h>
 #include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/types.h>
 
 struct ErrDesc {
     PRErrorCode const errNum;

xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx

@@ -33,7 +33,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
-#include <biginteger.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <vector>

xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx

@@ -18,11 +18,6 @@
  */
 
 #include <sal/types.h>
-#include <rtl/bootstrap.hxx>
-#include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <osl/thread.h>
 #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
 #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
@@ -30,12 +25,7 @@
 #include "seinitializer_nssimpl.hxx"
 #include "securityenvironment_nssimpl.hxx"
 
-#include <nspr.h>
 #include <cert.h>
-#include <nss.h>
-#include <pk11pub.h>
-#include <secmod.h>
-#include <nssckbi.h>
 
 
 namespace cssxc = css::xml::crypto;

xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx

@@ -18,14 +18,12 @@
  */
 
 #include "nssrenam.h"
-#include <nspr.h>
-#include <nss.h>
 #include <secder.h>
 
 #include <cert.h>
 #include <hasht.h>
 #include <secoid.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <sal/config.h>
 #include <comphelper/servicehelper.hxx>

xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx

@@ -19,11 +19,12 @@
 
 #include <sal/config.h>
 #include <vector>
-#include <rtl/uuid.h>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "securityenvironment_nssimpl.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::uno { class XComponentContext; }
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang ;

xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx

@@ -18,9 +18,7 @@
  */
 
 #include <sal/config.h>
-#include <rtl/uuid.h>
 
-#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
 #include <xmlelementwrapper_xmlsecimpl.hxx>
 #include <xmlsec/xmlstreamio.hxx>
 #include <xmlsec/errorcallback.hxx>
@@ -29,15 +27,15 @@
 
 #include <xmlsec-wrapper.h>
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <memory>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
 
 using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
-using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ;
 using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
 using ::com::sun::star::xml::crypto::XXMLSignature ;
 using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ;

xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx

@@ -28,14 +28,6 @@
 
 #include <xmloff/attrlist.hxx>
 
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <vector>
-
 #ifdef UNX
 #define stricmp strcasecmp
 #endif

xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx

@@ -20,10 +20,11 @@
 #include <string.h>
 
 #include "xmlelementwrapper_xmlsecimpl.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace com::sun::star;
 
 XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode)

xmlsecurity/source/xmlsec/xmlsec_init.cxx

@@ -13,7 +13,6 @@
 
 #include <xmlsec/xmlstreamio.hxx>
 #include <xmlsec-wrapper.h>
-#include <svl/cryptosign.hxx>
 #ifdef XMLSEC_CRYPTO_MSCRYPTO
 #include <xmlsec/mscng/crypto.h>
 #else

xmlsecurity/source/xmlsec/xmlstreamio.cxx

@@ -29,7 +29,6 @@
 
 #include <com/sun/star/xml/crypto/XUriBinding.hpp>
 
-#include <libxml/uri.h>
 #include <xmlsec-wrapper.h>
 
 static bool g_bInputCallbacksEnabled = false;