tdf#42949 Fix some more Include What You Use warnings

Change-Id: I2040315707674dc99a37aedb96ac61dca274c13a
Reviewed-on: https://gerrit.libreoffice.org/47348
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

10 files changed, 19 insertions, 49 deletions

diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index 50f683a35850..3abe91a727b2 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -26,12 +26,13 @@
 
 #include <svl/sigstruct.hxx>
 #include "xmlsignaturehelper.hxx"
-#include "pdfsignaturehelper.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include "documentsignaturehelper.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+class PDFSignatureHelper;
+
 /// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
 class XMLSECURITY_DLLPUBLIC DocumentSignatureManager
 {
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 622bc1ffb678..bafff6894040 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -11,13 +11,17 @@
 #ifndef INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 #define INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
-#include <vcl/filter/pdfdocument.hxx>
-
-#include <tools/stream.hxx>
-
 #include <xmlsecuritydllapi.h>
 
+namespace vcl
+{
+namespace filter
+{
+class PDFObjectElement;
+}
+}
 struct SignatureInformation;
+class SvStream;
 
 namespace xmlsecurity
 {
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx
index 95df24c1abc1..2997a333d9a7 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -15,9 +15,7 @@
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
+#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 
 #include <svl/sigstruct.hxx>
 
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 642a034ae5e1..1cd24d3b6a73 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -15,9 +15,11 @@
 #include <tools/datetime.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/filter/pdfdocument.hxx>
 
 #include <documentsignaturemanager.hxx>
 #include <pdfio/pdfdocument.hxx>
+#include <pdfsignaturehelper.hxx>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 18dd99644f35..4d67cf429d1e 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -18,27 +18,20 @@
 #include <unotest/macros_test.hxx>
 #include <test/xmltesttools.hxx>
 
-#include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>
-#include <com/sun/star/io/TempFile.hpp>
-#include <com/sun/star/packages/manifest/ManifestReader.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <sax/tools/converter.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <tools/date.hxx>
-#include <tools/time.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/objsh.hxx>
 #include <osl/file.hxx>
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 7d9acf5ea7a4..81a61791fc3a 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -42,6 +42,8 @@
 
 #include <xmlsec/xmlsec_init.hxx>
 
+#include <pdfsignaturehelper.hxx>
+
 using namespace css;
 
 DocumentSignatureManager::DocumentSignatureManager(
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 87f94958629c..bd8111aed6a6 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -16,7 +16,6 @@
 #include <com/sun/star/beans/StringPair.hpp>
 
 #include <comphelper/ofopxmlhelper.hxx>
-#include <config_global.h>
 #include <o3tl/make_unique.hxx>
 #include <rtl/ref.hxx>
 #include <unotools/datetime.hxx>
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index 3402107dee64..b3f2f16fb193 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -14,11 +14,10 @@
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/uno/SecurityException.hpp>
-#include <com/sun/star/xml/crypto/SEInitializer.hpp>
 
-#include <comphelper/sequence.hxx>
 #include <tools/stream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/filter/pdfdocument.hxx>
 
 #include <pdfio/pdfdocument.hxx>
 
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 08437b2f8cae..c90de6a33af6 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -9,46 +9,17 @@
 
 #include <pdfio/pdfdocument.hxx>
 
-#include <map>
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <comphelper/processfactory.hxx>
-#include <comphelper/scopeguard.hxx>
-#include <comphelper/string.hxx>
-#include <filter/msfilter/mscodec.hxx>
-#include <rtl/character.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
-#include <sax/tools/converter.hxx>
-#include <tools/zcodec.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/datetime.hxx>
-#include <vcl/pdfwriter.hxx>
-#include <xmloff/xmluconv.hxx>
-#include <o3tl/make_unique.hxx>
 
 #include <svl/sigstruct.hxx>
 #include <svl/cryptosign.hxx>
-
-#ifdef XMLSEC_CRYPTO_NSS
-#include <cert.h>
-#include <cms.h>
-#include <nss.h>
-#include <secerr.h>
-#include <sechash.h>
-#endif
-
-#ifdef XMLSEC_CRYPTO_MSCRYPTO
-#include <prewin.h>
-#include <wincrypt.h>
-#include <postwin.h>
-#include <comphelper/windowserrorstring.hxx>
-#endif
+#include <vcl/filter/pdfdocument.hxx>
 
 using namespace com::sun::star;
 
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx
index 55a20d51a6b9..90d03d37e32b 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -20,6 +20,7 @@
 #include <vcl/pngwrite.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/filter/pdfdocument.hxx>
 
 #include <pdfio/pdfdocument.hxx>